Published site at f3478674401164545065e4a039ac1d70a6c8bc2e.
diff --git a/acid-semantics.html b/acid-semantics.html
index 972b24c..14a8102 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -464,7 +464,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index f611bf4..7608fc6 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
Binary files differ
diff --git a/book.html b/book.html
index 0a84586..d0b16a1 100644
--- a/book.html
+++ b/book.html
@@ -48414,7 +48414,7 @@
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-alpha-4-SNAPSHOT<br>
-Last updated 2023-05-25 14:29:37 UTC
+Last updated 2023-05-26 14:29:36 UTC
 </div>
 </div>
 <script type="text/x-mathjax-config">
diff --git a/bulk-loads.html b/bulk-loads.html
index d895dfb..4e14222 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -180,7 +180,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index cb9d009..f4b4168 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -3303,27 +3303,20 @@
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
 <tr class="a">
 <td>javadoc</td>
-<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
-<ul>
-<li>offset: <code>&quot;2&quot;</code></li></ul></td>
-<td>3</td>
+<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
+<td>49</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
 <tr class="b">
-<td></td>
-<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>46</td>
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
-<tr class="a">
 <td>misc</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_misc.html#ArrayTypeStyle">ArrayTypeStyle</a></td>
 <td>113</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
-<tr class="b">
+<tr class="a">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_misc.html#UpperEll">UpperEll</a></td>
 <td>23</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
-<tr class="a">
+<tr class="b">
 <td>sizes</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_sizes.html#LineLength">LineLength</a>
 <ul>
@@ -3331,12 +3324,12 @@
 <li>ignorePattern: <code>&quot;^package.*|^import.*|a href|href|http://|https://|ftp://|org.apache.thrift.|com.google.protobuf.|hbase.protobuf.generated&quot;</code></li></ul></td>
 <td>134</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
-<tr class="b">
+<tr class="a">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_sizes.html#MethodLength">MethodLength</a></td>
 <td>61</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
-<tr class="a">
+<tr class="b">
 <td>whitespace</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter">FileTabCharacter</a></td>
 <td>1</td>
@@ -3344,19 +3337,19 @@
 <h2><a name="Details"></a>Details</h2><section>
 <h3 id="log4j2.properties">log4j2.properties</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>65</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -3364,63 +3357,63 @@
 <td>65</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.AcidGuaranteesTestTool.java">org/apache/hadoop/hbase/AcidGuaranteesTestTool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>141</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>165</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>217</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>218</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>284</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>285</td></tr>
+<td>284</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>285</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>339</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.CatalogFamilyFormat.java">org/apache/hadoop/hbase/CatalogFamilyFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -3428,93 +3421,93 @@
 <td>81</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.CellUtil.java">org/apache/hadoop/hbase/CellUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>312</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>315</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>324</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>333</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>360</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>366</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>393</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>504</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>611</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>682</td></tr>
+<td>611</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>682</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>815</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.CompoundConfiguration.java">org/apache/hadoop/hbase/CompoundConfiguration.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>172</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3522,19 +3515,19 @@
 <td>174</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.DistributedHBaseCluster.java">org/apache/hadoop/hbase/DistributedHBaseCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>488</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3542,13 +3535,13 @@
 <td>490</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.HBaseConfiguration.java">org/apache/hadoop/hbase/HBaseConfiguration.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3556,146 +3549,140 @@
 <td>41</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.HBaseTestingUtil.java">org/apache/hadoop/hbase/HBaseTestingUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>361</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>363</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>499</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>503</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>1014</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1229</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2024</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>3080</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3495</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3497</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>3528</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>3568</td></tr>
+<td>3528</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>3568</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>3570</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.HBaseTestingUtility.java">org/apache/hadoop/hbase/HBaseTestingUtility.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>349</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>351</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>487</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>491</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>502</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>587</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>602</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>618</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
@@ -3704,73 +3691,79 @@
 <td>618</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
+<td>618</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>1247</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1462</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2269</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>3394</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>3519</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3808</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3810</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>3843</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>3884</td></tr>
+<td>3843</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>3884</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>3886</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.HTestConst.java">org/apache/hadoop/hbase/HTestConst.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -3778,13 +3771,13 @@
 <td>36</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.IntegrationTestDDLMasterFailover.java">org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3792,19 +3785,19 @@
 <td>902</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.IntegrationTestManyRegions.java">org/apache/hadoop/hbase/IntegrationTestManyRegions.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>88</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3812,19 +3805,19 @@
 <td>99</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.IntegrationTestMetaReplicas.java">org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>87</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3832,43 +3825,43 @@
 <td>89</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.IntegrationTestRegionReplicaPerf.java">org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>68</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>121</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>145</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>147</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>282</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
@@ -3876,25 +3869,25 @@
 <td>297</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.KeyValueTestUtil.java">org/apache/hadoop/hbase/KeyValueTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>31</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>66</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3902,25 +3895,25 @@
 <td>68</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.KeyValueUtil.java">org/apache/hadoop/hbase/KeyValueUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>45</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>420</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3928,19 +3921,19 @@
 <td>712</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.LocalHBaseCluster.java">org/apache/hadoop/hbase/LocalHBaseCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>263</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -3948,13 +3941,13 @@
 <td>264</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.MetaMockingUtil.java">org/apache/hadoop/hbase/MetaMockingUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -3962,19 +3955,19 @@
 <td>31</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.MiniHBaseCluster.java">org/apache/hadoop/hbase/MiniHBaseCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'hbaseCluster' must be private and have accessor methods.</td>
 <td>59</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -3982,19 +3975,19 @@
 <td>624</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.MultithreadedTestUtil.java">org/apache/hadoop/hbase/MultithreadedTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>68</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4002,19 +3995,19 @@
 <td>83</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.NamespaceDescriptor.java">org/apache/hadoop/hbase/NamespaceDescriptor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class NamespaceDescriptor should be declared as final.</td>
 <td>35</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -4022,42 +4015,36 @@
 <td>156</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.PerformanceEvaluation.java">org/apache/hadoop/hbase/PerformanceEvaluation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>440</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>492</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>582</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>583</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>UpperEll</td>
-<td>Should use uppercase 'L'.</td>
-<td>730</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
@@ -4072,119 +4059,125 @@
 <td>730</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>UpperEll</td>
+<td>Should use uppercase 'L'.</td>
+<td>730</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1199</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1200</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1209</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1216</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1225</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1230</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1387</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1389</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1550</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>1812</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>1860</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1969</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>2151</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>2315</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>2399</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2556</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2557</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>2667</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 300 lines (max allowed is 150).</td>
 <td>2701</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4192,13 +4185,13 @@
 <td>2865</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.PerformanceEvaluationCommons.java">org/apache/hadoop/hbase/PerformanceEvaluationCommons.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4206,95 +4199,95 @@
 <td>30</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.PrivateCellUtil.java">org/apache/hadoop/hbase/PrivateCellUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2485</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2489</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2492</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2496</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>2497</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>2627</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>2785</td></tr>
+<td>2627</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>2785</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>2798</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.RegionLocations.java">org/apache/hadoop/hbase/RegionLocations.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>144</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>145</td></tr>
+<td>144</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>145</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>147</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ScanPerformanceEvaluation.java">org/apache/hadoop/hbase/ScanPerformanceEvaluation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -4302,13 +4295,13 @@
 <td>80</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.SplitLogCounters.java">org/apache/hadoop/hbase/SplitLogCounters.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -4316,13 +4309,13 @@
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.SplitLogTask.java">org/apache/hadoop/hbase/SplitLogTask.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4330,19 +4323,19 @@
 <td>135</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.StripeCompactionsPerformanceEvaluation.java">org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>121</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4350,19 +4343,19 @@
 <td>144</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TableName.java">org/apache/hadoop/hbase/TableName.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>515</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4370,13 +4363,13 @@
 <td>516</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TagBuilderFactory.java">org/apache/hadoop/hbase/TagBuilderFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4384,13 +4377,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TagType.java">org/apache/hadoop/hbase/TagType.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4398,13 +4391,13 @@
 <td>23</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestClientClusterStatus.java">org/apache/hadoop/hbase/TestClientClusterStatus.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4412,13 +4405,13 @@
 <td>176</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestGlobalMemStoreSize.java">org/apache/hadoop/hbase/TestGlobalMemStoreSize.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4426,19 +4419,19 @@
 <td>175</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestIOFencing.java">org/apache/hadoop/hbase/TestIOFencing.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>91</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -4446,13 +4439,13 @@
 <td>319</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestLocalHBaseCluster.java">org/apache/hadoop/hbase/TestLocalHBaseCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -4460,19 +4453,19 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestMetaTableAccessor.java">org/apache/hadoop/hbase/TestMetaTableAccessor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>229</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4480,13 +4473,13 @@
 <td>230</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestNodeHealthCheckChore.java">org/apache/hadoop/hbase/TestNodeHealthCheckChore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4494,63 +4487,63 @@
 <td>61</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestPartialResultsFromClientSide.java">org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>334</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>386</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>643</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>664</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>670</td></tr>
+<td>664</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>670</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>671</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TestRegionRebalancing.java">org/apache/hadoop/hbase/TestRegionRebalancing.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>206</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4558,19 +4551,19 @@
 <td>232</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.TimestampTestBase.java">org/apache/hadoop/hbase/TimestampTestBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>37</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -4578,13 +4571,13 @@
 <td>190</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ZNodeClearer.java">org/apache/hadoop/hbase/ZNodeClearer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4592,39 +4585,39 @@
 <td>110</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.backup.HFileArchiver.java">org/apache/hadoop/hbase/backup/HFileArchiver.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class HFileArchiver should be declared as final.</td>
 <td>62</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>351</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>746</td></tr></table></section><section>
+<td>760</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.ChaosConstants.java">org/apache/hadoop/hbase/chaos/ChaosConstants.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4632,19 +4625,19 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.ChaosService.java">org/apache/hadoop/hbase/chaos/ChaosService.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>41</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4652,13 +4645,13 @@
 <td>122</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.ChaosUtils.java">org/apache/hadoop/hbase/chaos/ChaosUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4666,13 +4659,13 @@
 <td>29</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.factories.MonkeyConstants.java">org/apache/hadoop/hbase/chaos/factories/MonkeyConstants.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>InterfaceIsType</td>
@@ -4680,13 +4673,13 @@
 <td>24</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.policies.PeriodicPolicy.java">org/apache/hadoop/hbase/chaos/policies/PeriodicPolicy.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4694,27 +4687,27 @@
 <td>43</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.chaos.util.ChaosMonkeyRunner.java">org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
-<td>JavadocTagContinuationIndentation</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 20 has parse error. Missed HTML close tag 'path-to-conf'. Sometimes it means that close tag missed for one of previous tags.</td>
 <td>172</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Action.java">org/apache/hadoop/hbase/client/Action.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4722,39 +4715,39 @@
 <td>94</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Admin.java">org/apache/hadoop/hbase/client/Admin.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>sizes</td>
-<td>LineLength</td>
-<td>Line is longer than 100 characters (found 112).</td>
-<td>730</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 112).</td>
-<td>741</td></tr>
+<td>730</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 112).</td>
+<td>741</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>sizes</td>
+<td>LineLength</td>
+<td>Line is longer than 100 characters (found 112).</td>
 <td>767</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.AsyncAdmin.java">org/apache/hadoop/hbase/client/AsyncAdmin.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
@@ -4762,25 +4755,25 @@
 <td>1369</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.AsyncBatchRpcRetryingCaller.java">org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'loc' must be private and have accessor methods.</td>
 <td>123</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'actions' must be private and have accessor methods.</td>
 <td>125</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -4788,31 +4781,31 @@
 <td>134</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.AsyncClientScanner.java">org/apache/hadoop/hbase/client/AsyncClientScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'loc' must be private and have accessor methods.</td>
 <td>138</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'stub' must be private and have accessor methods.</td>
 <td>142</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'controller' must be private and have accessor methods.</td>
 <td>144</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -4820,13 +4813,13 @@
 <td>146</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.AsyncTableImpl.java">org/apache/hadoop/hbase/client/AsyncTableImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -4834,13 +4827,13 @@
 <td>243</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.ClientUtil.java">org/apache/hadoop/hbase/client/ClientUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4848,13 +4841,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder.java">org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -4862,13 +4855,13 @@
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.HConnectionTestingUtility.java">org/apache/hadoop/hbase/client/HConnectionTestingUtility.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4876,39 +4869,39 @@
 <td>27</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Mutation.java">org/apache/hadoop/hbase/client/Mutation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>354</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>373</td></tr>
+<td>354</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>373</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>383</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor.java">org/apache/hadoop/hbase/client/PackagePrivateFieldAccessor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -4916,13 +4909,13 @@
 <td>31</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Query.java">org/apache/hadoop/hbase/client/Query.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -4930,39 +4923,39 @@
 <td>78</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RegionInfo.java">org/apache/hadoop/hbase/client/RegionInfo.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>346</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>355</td></tr>
+<td>346</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>355</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>368</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RegionInfoBuilder.java">org/apache/hadoop/hbase/client/RegionInfoBuilder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -4970,57 +4963,57 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RegionInfoDisplay.java">org/apache/hadoop/hbase/client/RegionInfoDisplay.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>31</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>43</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>57</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>67</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>107</td></tr>
+<td>67</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>107</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>108</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RegionReplicaUtil.java">org/apache/hadoop/hbase/client/RegionReplicaUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -5028,13 +5021,13 @@
 <td>30</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RequestControllerFactory.java">org/apache/hadoop/hbase/client/RequestControllerFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -5042,13 +5035,13 @@
 <td>27</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Result.java">org/apache/hadoop/hbase/client/Result.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5056,13 +5049,13 @@
 <td>838</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.ResultScanner.java">org/apache/hadoop/hbase/client/ResultScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -5070,13 +5063,13 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException.java">org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5084,13 +5077,13 @@
 <td>145</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.SnapshotDescription.java">org/apache/hadoop/hbase/client/SnapshotDescription.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -5098,13 +5091,13 @@
 <td>67</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TableDescriptorBuilder.java">org/apache/hadoop/hbase/client/TableDescriptorBuilder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -5112,13 +5105,13 @@
 <td>58</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TableState.java">org/apache/hadoop/hbase/client/TableState.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5126,13 +5119,13 @@
 <td>165</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAdmin.java">org/apache/hadoop/hbase/client/TestAdmin.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -5140,19 +5133,19 @@
 <td>174</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAsyncRegionAdminApi.java">org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>286</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5160,13 +5153,13 @@
 <td>293</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAsyncReplicationAdminApi.java">org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -5174,19 +5167,19 @@
 <td>451</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAsyncTableScanMetrics.java">org/apache/hadoop/hbase/client/TestAsyncTableScanMetrics.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>118</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -5194,13 +5187,13 @@
 <td>136</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAsyncTableScanner.java">org/apache/hadoop/hbase/client/TestAsyncTableScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -5208,77 +5201,77 @@
 <td>92</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestAvoidCellReferencesIntoShippedBlocks.java">org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>100</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>123</td></tr>
+<td>100</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
+<td>123</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>247</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestBlockEvictionFromClient.java">org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>109</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>130</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>138</td></tr>
+<td>130</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
+<td>138</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
 <td>148</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestFromClientSide3.java">org/apache/hadoop/hbase/client/TestFromClientSide3.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>111</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -5286,19 +5279,19 @@
 <td>119</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestFromClientSideNoCodec.java">org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>58</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -5306,13 +5299,13 @@
 <td>68</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestImmutableScan.java">org/apache/hadoop/hbase/client/TestImmutableScan.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -5320,13 +5313,13 @@
 <td>118</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestIncrementsFromClientSide.java">org/apache/hadoop/hbase/client/TestIncrementsFromClientSide.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -5334,183 +5327,183 @@
 <td>97</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestMultipleTimestamps.java">org/apache/hadoop/hbase/client/TestMultipleTimestamps.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
 <td>Using the '.*' form of import should be avoided - org.junit.Assert.*.</td>
 <td>20</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>65</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>73</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>81</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>89</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>201</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>316</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>346</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>371</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>396</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>431</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>432</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>444</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>445</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>448</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>461</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>465</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>479</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>480</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>497</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>498</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>509</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>510</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>517</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>518</td></tr>
+<td>517</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>518</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>525</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestPutWithDelete.java">org/apache/hadoop/hbase/client/TestPutWithDelete.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>51</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -5518,13 +5511,13 @@
 <td>59</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestRawAsyncTableScan.java">org/apache/hadoop/hbase/client/TestRawAsyncTableScan.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -5532,13 +5525,13 @@
 <td>85</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestReplicaWithCluster.java">org/apache/hadoop/hbase/client/TestReplicaWithCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5546,13 +5539,13 @@
 <td>271</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestReplicasClient.java">org/apache/hadoop/hbase/client/TestReplicasClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5560,39 +5553,39 @@
 <td>259</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestScannerTimeout.java">org/apache/hadoop/hbase/client/TestScannerTimeout.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>64</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>83</td></tr>
+<td>64</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
+<td>83</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
 <td>91</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestScannersFromClientSide2.java">org/apache/hadoop/hbase/client/TestScannersFromClientSide2.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -5600,105 +5593,105 @@
 <td>134</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.TestTimestampsFilter.java">org/apache/hadoop/hbase/client/TestTimestampsFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>64</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>72</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>80</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>88</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>105</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>252</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>315</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>316</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>333</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>334</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>348</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>349</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>366</td></tr>
+<td>349</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>366</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>367</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.coprocessor.AggregationClient.java">org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -5706,19 +5699,19 @@
 <td>195</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.coprocessor.Batch.java">org/apache/hadoop/hbase/client/coprocessor/Batch.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>34</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -5726,19 +5719,19 @@
 <td>53</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.coprocessor.DoubleColumnInterpreter.java">org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>46</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5746,87 +5739,87 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.coprocessor.LongColumnInterpreter.java">org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>46</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>54</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>63</td></tr>
+<td>54</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>63</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>74</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.coprocessor.package-info.java">org/apache/hadoop/hbase/client/coprocessor/package-info.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 146).</td>
 <td>54</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 200).</td>
 <td>55</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 144).</td>
 <td>75</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 206).</td>
 <td>76</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 111).</td>
 <td>95</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>96</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 124).</td>
 <td>149</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -5834,13 +5827,13 @@
 <td>190</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.locking.EntityLock.java">org/apache/hadoop/hbase/client/locking/EntityLock.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5848,61 +5841,61 @@
 <td>125</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.metrics.ScanMetrics.java">org/apache/hadoop/hbase/client/metrics/ScanMetrics.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfRPCcalls' must be private and have accessor methods.</td>
 <td>54</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfRemoteRPCcalls' must be private and have accessor methods.</td>
 <td>59</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'sumOfMillisSecBetweenNexts' must be private and have accessor methods.</td>
 <td>64</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfNSRE' must be private and have accessor methods.</td>
 <td>70</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfBytesInResults' must be private and have accessor methods.</td>
 <td>75</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfBytesInRemoteResults' must be private and have accessor methods.</td>
 <td>80</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfRegions' must be private and have accessor methods.</td>
 <td>86</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'countOfRPCRetries' must be private and have accessor methods.</td>
 <td>91</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -5910,13 +5903,13 @@
 <td>96</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.codec.BaseDecoder.java">org/apache/hadoop/hbase/codec/BaseDecoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5924,19 +5917,19 @@
 <td>82</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.codec.BaseEncoder.java">org/apache/hadoop/hbase/codec/BaseEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>48</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5944,13 +5937,13 @@
 <td>53</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.codec.CodecPerformance.java">org/apache/hadoop/hbase/codec/CodecPerformance.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -5958,19 +5951,19 @@
 <td>39</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.constraint.CheckConfigurationConstraint.java">org/apache/hadoop/hbase/constraint/CheckConfigurationConstraint.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>47</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -5978,25 +5971,25 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.constraint.Constraint.java">org/apache/hadoop/hbase/constraint/Constraint.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 119).</td>
 <td>30</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>35</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -6004,37 +5997,37 @@
 <td>37</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.constraint.package-info.java">org/apache/hadoop/hbase/constraint/package-info.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 120).</td>
 <td>42</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 121).</td>
 <td>45</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 127).</td>
 <td>63</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 155).</td>
 <td>64</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -6042,19 +6035,19 @@
 <td>66</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coordination.ZKSplitLogManagerCoordination.java">org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'ignoreZKDeleteForTesting' must be private and have accessor methods.</td>
 <td>82</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -6062,19 +6055,19 @@
 <td>447</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination.java">org/apache/hadoop/hbase/coordination/ZkSplitLogWorkerCoordination.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>154</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -6082,13 +6075,13 @@
 <td>218</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.BaseEnvironment.java">org/apache/hadoop/hbase/coprocessor/BaseEnvironment.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -6096,19 +6089,19 @@
 <td>37</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.CoprocessorHost.java">org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>133</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6116,13 +6109,13 @@
 <td>662</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.MetricsCoprocessor.java">org/apache/hadoop/hbase/coprocessor/MetricsCoprocessor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -6130,13 +6123,13 @@
 <td>30</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.ObserverContextImpl.java">org/apache/hadoop/hbase/coprocessor/ObserverContextImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
@@ -6144,45 +6137,45 @@
 <td>98</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.RegionObserver.java">org/apache/hadoop/hbase/coprocessor/RegionObserver.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 109).</td>
 <td>683</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>sizes</td>
-<td>LineLength</td>
-<td>Line is longer than 100 characters (found 109).</td>
-<td>712</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 109).</td>
-<td>841</td></tr>
+<td>712</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 109).</td>
+<td>841</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>sizes</td>
+<td>LineLength</td>
+<td>Line is longer than 100 characters (found 109).</td>
 <td>870</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.TestCoprocessorInterface.java">org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -6190,37 +6183,37 @@
 <td>340</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.TestRegionObserverInterface.java">org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>499</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>525</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>562</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>916</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -6228,13 +6221,13 @@
 <td>917</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.TestRegionObserverPreFlushAndPreCompact.java">org/apache/hadoop/hbase/coprocessor/TestRegionObserverPreFlushAndPreCompact.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -6242,13 +6235,13 @@
 <td>53</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.TestRegionObserverScannerOpenHook.java">org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6256,13 +6249,13 @@
 <td>300</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.coprocessor.package-info.java">org/apache/hadoop/hbase/coprocessor/package-info.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -6270,13 +6263,13 @@
 <td>209</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.errorhandling.ForeignException.java">org/apache/hadoop/hbase/errorhandling/ForeignException.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6284,13 +6277,13 @@
 <td>99</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher.java">org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6298,13 +6291,13 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.errorhandling.TimeoutExceptionInjector.java">org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6312,31 +6305,31 @@
 <td>60</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.favored.FavoredNodeAssignmentHelper.java">org/apache/hadoop/hbase/favored/FavoredNodeAssignmentHelper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>234</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>239</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>393</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6344,19 +6337,19 @@
 <td>595</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.favored.StartcodeAgnosticServerName.java">org/apache/hadoop/hbase/favored/StartcodeAgnosticServerName.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>58</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6364,13 +6357,13 @@
 <td>60</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.ColumnCountGetFilter.java">org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6378,13 +6371,13 @@
 <td>54</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.ColumnPrefixFilter.java">org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6392,45 +6385,45 @@
 <td>109</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.ColumnRangeFilter.java">org/apache/hadoop/hbase/filter/ColumnRangeFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>141</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>142</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>150</td></tr>
+<td>142</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>150</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>153</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.CompareFilter.java">org/apache/hadoop/hbase/filter/CompareFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6438,13 +6431,13 @@
 <td>164</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.DependentColumnFilter.java">org/apache/hadoop/hbase/filter/DependentColumnFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6452,19 +6445,19 @@
 <td>127</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FilterAllFilter.java">org/apache/hadoop/hbase/filter/FilterAllFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>56</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6472,129 +6465,129 @@
 <td>57</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FilterListWithAND.java">org/apache/hadoop/hbase/filter/FilterListWithAND.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 107).</td>
 <td>72</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
 <td>82</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
 <td>83</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
 <td>84</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
 <td>85</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
 <td>86</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>sizes</td>
-<td>LineLength</td>
-<td>Line is longer than 100 characters (found 198).</td>
-<td>87</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
-<td>88</td></tr>
+<td>87</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 198).</td>
+<td>88</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>sizes</td>
+<td>LineLength</td>
+<td>Line is longer than 100 characters (found 198).</td>
 <td>89</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FilterListWithOR.java">org/apache/hadoop/hbase/filter/FilterListWithOR.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 107).</td>
 <td>130</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 170).</td>
 <td>140</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 157).</td>
 <td>141</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 157).</td>
 <td>142</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 157).</td>
 <td>143</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 154).</td>
 <td>144</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 154).</td>
 <td>145</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 154).</td>
 <td>146</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 170).</td>
 <td>147</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6602,13 +6595,13 @@
 <td>156</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FilterTestingCluster.java">org/apache/hadoop/hbase/filter/FilterTestingCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -6616,45 +6609,45 @@
 <td>50</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FilterWrapper.java">org/apache/hadoop/hbase/filter/FilterWrapper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>61</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>100</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>160</td></tr>
+<td>100</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>160</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>161</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter.java">org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6662,115 +6655,115 @@
 <td>56</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.FuzzyRowFilter.java">org/apache/hadoop/hbase/filter/FuzzyRowFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>144</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>627</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>629</td></tr>
+<td>627</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>629</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>648</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.InclusiveStopFilter.java">org/apache/hadoop/hbase/filter/InclusiveStopFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>52</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>59</td></tr>
+<td>52</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>59</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>83</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.MultiRowRangeFilter.java">org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>112</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>187</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>190</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>241</td></tr>
+<td>190</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>241</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 155 lines (max allowed is 150).</td>
 <td>262</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.MultipleColumnPrefixFilter.java">org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>125</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6778,13 +6771,13 @@
 <td>179</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.PageFilter.java">org/apache/hadoop/hbase/filter/PageFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6792,13 +6785,13 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.ParseConstants.java">org/apache/hadoop/hbase/filter/ParseConstants.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -6806,97 +6799,97 @@
 <td>27</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.ParseFilter.java">org/apache/hadoop/hbase/filter/ParseFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>783</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>784</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>786</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>787</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>789</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>790</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>791</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>801</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>806</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>808</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>810</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>812</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>815</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>817</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6904,57 +6897,57 @@
 <td>866</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.PrefixFilter.java">org/apache/hadoop/hbase/filter/PrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>53</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>54</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>56</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>78</td></tr>
+<td>56</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>78</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>108</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.SingleColumnValueFilter.java">org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>322</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -6962,31 +6955,31 @@
 <td>323</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestColumnPrefixFilter.java">org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>121</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>122</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>189</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -6994,13 +6987,13 @@
 <td>190</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestColumnRangeFilter.java">org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -7008,13 +7001,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestDependentColumnFilter.java">org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7022,51 +7015,51 @@
 <td>152</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestFilter.java">org/apache/hadoop/hbase/filter/TestFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 154 lines (max allowed is 150).</td>
 <td>740</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1760</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1779</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1797</td></tr>
+<td>1779</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1797</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1825</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestFilterWrapper.java">org/apache/hadoop/hbase/filter/TestFilterWrapper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7074,57 +7067,57 @@
 <td>137</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestFuzzyRowAndColumnRangeFilter.java">org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>72</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>80</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>88</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>96</td></tr>
+<td>88</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
+<td>96</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>152</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestFuzzyRowFilterEndToEnd.java">org/apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEnd.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>236</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7132,55 +7125,55 @@
 <td>246</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestMultipleColumnPrefixFilter.java">org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>124</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>125</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>197</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>198</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>245</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>246</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>256</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -7188,13 +7181,13 @@
 <td>257</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestPrefixFilter.java">org/apache/hadoop/hbase/filter/TestPrefixFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -7202,13 +7195,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestRandomRowFilter.java">org/apache/hadoop/hbase/filter/TestRandomRowFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -7216,19 +7209,19 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.TestRegexComparator.java">org/apache/hadoop/hbase/filter/TestRegexComparator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
 <td>Using the '.*' form of import should be avoided - org.junit.Assert.*.</td>
 <td>20</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -7236,13 +7229,13 @@
 <td>91</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.filter.WhileMatchFilter.java">org/apache/hadoop/hbase/filter/WhileMatchFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7250,13 +7243,13 @@
 <td>67</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.fs.TestBlockReorderBlockLocation.java">org/apache/hadoop/hbase/fs/TestBlockReorderBlockLocation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -7264,13 +7257,13 @@
 <td>131</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.hbtop.HBTop.java">org/apache/hadoop/hbase/hbtop/HBTop.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -7278,99 +7271,99 @@
 <td>61</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.hbtop.screen.top.TopScreenPresenter.java">org/apache/hadoop/hbase/hbtop/screen/top/TopScreenPresenter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
 <td>251</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
 <td>252</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
 <td>253</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block rcurly' has incorrect indentation level 6, expected level should be 4.</td>
 <td>254</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 6.</td>
 <td>324</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 8.</td>
 <td>325</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 6.</td>
 <td>326</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 6.</td>
 <td>328</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 8.</td>
 <td>329</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 6.</td>
 <td>330</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
-<td>332</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
-<td>333</td></tr>
+<td>332</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
+<td>'block' child has incorrect indentation level 8, expected level should be 6.</td>
+<td>333</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>indentation</td>
+<td>Indentation</td>
 <td>'block rcurly' has incorrect indentation level 6, expected level should be 4.</td>
 <td>334</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.http.HttpServerFunctionalTest.java">org/apache/hadoop/hbase/http/HttpServerFunctionalTest.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -7378,13 +7371,13 @@
 <td>44</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.http.lib.TestAuthenticationFilterInitializer.java">org/apache/hadoop/hbase/http/lib/TestAuthenticationFilterInitializer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -7392,13 +7385,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.http.prometheus.PrometheusHadoopServlet.java">org/apache/hadoop/hbase/http/prometheus/PrometheusHadoopServlet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7406,13 +7399,13 @@
 <td>73</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.ByteBuffInputStream.java">org/apache/hadoop/hbase/io/ByteBuffInputStream.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -7420,31 +7413,31 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.FSDataInputStreamWrapper.java">org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>130</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>160</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>169</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -7452,101 +7445,101 @@
 <td>189</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.FileLink.java">org/apache/hadoop/hbase/io/FileLink.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>220</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>259</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>262</td></tr>
+<td>259</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>262</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>326</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.HalfStoreFileReader.java">org/apache/hadoop/hbase/io/HalfStoreFileReader.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 192 lines (max allowed is 150).</td>
 <td>94</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'atEnd' must be private and have accessor methods.</td>
 <td>100</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>104</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>110</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>117</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>124</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>131</td></tr>
+<td>124</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>131</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>138</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.ImmutableBytesWritable.java">org/apache/hadoop/hbase/io/ImmutableBytesWritable.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7554,63 +7547,63 @@
 <td>139</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.Reference.java">org/apache/hadoop/hbase/io/Reference.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>162</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>209</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>210</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>211</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>214</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>215</td></tr>
+<td>214</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>215</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>216</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestByteBufferOutputStream.java">org/apache/hadoop/hbase/io/TestByteBufferOutputStream.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -7618,65 +7611,65 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestFileLink.java">org/apache/hadoop/hbase/io/TestFileLink.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>239</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>240</td></tr>
+<td>239</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>240</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>347</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestHFileLink.java">org/apache/hadoop/hbase/io/TestHFileLink.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>55</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>100</td></tr>
+<td>55</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>100</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>111</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestHalfStoreFileReader.java">org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -7684,19 +7677,19 @@
 <td>246</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestHeapSize.java">org/apache/hadoop/hbase/io/TestHeapSize.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 177 lines (max allowed is 150).</td>
 <td>116</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -7704,19 +7697,19 @@
 <td>299</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.TestImmutableBytesWritable.java">org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>91</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7724,13 +7717,13 @@
 <td>92</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.java">org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -7738,63 +7731,63 @@
 <td>312</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.compress.Compression.java">org/apache/hadoop/hbase/io/compress/Compression.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>108</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>461</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>476</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>485</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>502</td></tr>
+<td>485</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>502</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>505</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.crypto.Encryption.java">org/apache/hadoop/hbase/io/crypto/Encryption.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class Context should be declared as final.</td>
 <td>99</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -7802,13 +7795,13 @@
 <td>409</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.crypto.aes.CryptoAES.java">org/apache/hadoop/hbase/io/crypto/aes/CryptoAES.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -7816,13 +7809,13 @@
 <td>212</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.crypto.tls.X509Util.java">org/apache/hadoop/hbase/io/crypto/tls/X509Util.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -7830,13 +7823,13 @@
 <td>475</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.encoding.CopyKeyDataBlockEncoder.java">org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -7844,13 +7837,13 @@
 <td>95</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.encoding.DiffKeyDeltaEncoder.java">org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -7858,13 +7851,13 @@
 <td>389</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.encoding.FastDiffDeltaEncoder.java">org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -7872,13 +7865,13 @@
 <td>375</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.encoding.PrefixKeyDeltaEncoder.java">org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -7886,25 +7879,25 @@
 <td>191</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.BlockCacheUtil.java">org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>43</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>161</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7912,19 +7905,19 @@
 <td>282</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.BlockCachesIterator.java">org/apache/hadoop/hbase/io/hfile/BlockCachesIterator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>39</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7932,19 +7925,19 @@
 <td>41</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.BlockType.java">org/apache/hadoop/hbase/io/hfile/BlockType.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>155</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -7952,51 +7945,51 @@
 <td>156</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.CacheStats.java">org/apache/hadoop/hbase/io/hfile/CacheStats.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>148</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>149</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>194</td></tr>
+<td>149</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>194</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>195</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.CacheTestUtils.java">org/apache/hadoop/hbase/io/hfile/CacheTestUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>46</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -8004,13 +7997,13 @@
 <td>230</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.CacheableDeserializerIdManager.java">org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -8018,13 +8011,13 @@
 <td>32</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.ChecksumUtil.java">org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -8032,13 +8025,13 @@
 <td>34</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.CompoundBloomFilterWriter.java">org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -8046,13 +8039,13 @@
 <td>238</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.FixedFileTrailer.java">org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -8060,161 +8053,161 @@
 <td>378</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.HFileBlockIndex.java">org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>61</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>385</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>781</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>783</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>784</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1074</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1108</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1110</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1253</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1277</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1465</td></tr>
+<td>1277</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1465</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1560</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter.java">org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>166</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>210</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>212</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>216</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>558</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>571</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>721</td></tr>
+<td>571</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>721</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class Builder should be declared as final.</td>
 <td>747</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.KVGenerator.java">org/apache/hadoop/hbase/io/hfile/KVGenerator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>39</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>60</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8222,13 +8215,13 @@
 <td>95</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.LruCachedBlock.java">org/apache/hadoop/hbase/io/hfile/LruCachedBlock.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8236,45 +8229,45 @@
 <td>96</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.NanoTimer.java">org/apache/hadoop/hbase/io/hfile/NanoTimer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>36</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>65</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>106</td></tr>
+<td>65</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>106</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>108</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.NoOpDataBlockEncoder.java">org/apache/hadoop/hbase/io/hfile/NoOpDataBlockEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -8282,25 +8275,25 @@
 <td>36</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.NoOpIndexBlockEncoder.java">org/apache/hadoop/hbase/io/hfile/NoOpIndexBlockEncoder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class NoOpIndexBlockEncoder should be declared as final.</td>
 <td>43</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>87</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8308,73 +8301,73 @@
 <td>255</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.RandomKeyValueUtil.java">org/apache/hadoop/hbase/io/hfile/RandomKeyValueUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>27</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>34</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>37</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>40</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>56</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>83</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>84</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>88</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>100</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>101</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8382,13 +8375,13 @@
 <td>105</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestCacheConfig.java">org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8396,19 +8389,19 @@
 <td>357</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestChecksum.java">org/apache/hadoop/hbase/io/hfile/TestChecksum.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>87</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8416,13 +8409,13 @@
 <td>217</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestFixedFileTrailer.java">org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8430,19 +8423,19 @@
 <td>97</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestForceCacheImportantBlocks.java">org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>125</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8450,69 +8443,69 @@
 <td>126</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestHFileBlock.java">org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
 <td>Using the '.*' form of import should be avoided - org.junit.Assert.*.</td>
 <td>23</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'for' construct must use '{}'s.</td>
-<td>178</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
-<td>366</td></tr>
+<td>178</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'for' construct must use '{}'s.</td>
+<td>366</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>842</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestHFileBlockIndex.java">org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>342</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>351</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>368</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>638</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8520,13 +8513,13 @@
 <td>689</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestHFileWriterV3.java">org/apache/hadoop/hbase/io/hfile/TestHFileWriterV3.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -8534,109 +8527,109 @@
 <td>124</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestPrefetch.java">org/apache/hadoop/hbase/io/hfile/TestPrefetch.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
 <td>179</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 6, expected level should be 8.</td>
 <td>180</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 12.</td>
 <td>182</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rparen' has incorrect indentation level 6, expected level should be 8.</td>
 <td>183</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
 <td>184</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
 <td>185</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block rcurly' has incorrect indentation level 4, expected level should be 6.</td>
 <td>186</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
 <td>199</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 6, expected level should be 8.</td>
 <td>200</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
 <td>201</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
 <td>202</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 12.</td>
 <td>204</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rparen' has incorrect indentation level 6, expected level should be 8.</td>
 <td>205</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
 <td>206</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
 <td>207</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
 <td>208</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
@@ -8644,13 +8637,13 @@
 <td>209</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.TestScannerSelectionUsingKeyRange.java">org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -8658,171 +8651,171 @@
 <td>131</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.java">org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>55</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>71</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>131</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>137</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>138</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>140</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>161</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>207</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>209</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>219</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>220</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>253</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>254</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>291</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>300</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>301</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>325</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>426</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>462</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>470</td></tr>
+<td>462</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>470</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>687</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.java">org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1396</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1400</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1410</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1691</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8830,19 +8823,19 @@
 <td>1694</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.bucket.TestBucketCache.java">org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>185</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8850,13 +8843,13 @@
 <td>841</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.hfile.bucket.TestBucketWriterThread.java">org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8864,25 +8857,25 @@
 <td>103</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.util.LRUDictionary.java">org/apache/hadoop/hbase/io/util/LRUDictionary.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>66</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>132</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -8890,19 +8883,19 @@
 <td>144</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.util.MemorySizeUtil.java">org/apache/hadoop/hbase/io/util/MemorySizeUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>34</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8910,87 +8903,87 @@
 <td>137</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.io.util.StreamUtils.java">org/apache/hadoop/hbase/io/util/StreamUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>38</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>59</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>63</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>67</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>71</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>93</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>97</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>coding</td>
-<td>InnerAssignment</td>
-<td>Inner assignments should be avoided.</td>
-<td>101</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
-<td>105</td></tr>
+<td>101</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>coding</td>
+<td>InnerAssignment</td>
+<td>Inner assignments should be avoided.</td>
+<td>105</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>260</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.BlockingRpcConnection.java">org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>492</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -8998,19 +8991,19 @@
 <td>561</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.BufferCallBeforeInitHandler.java">org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'action' must be private and have accessor methods.</td>
 <td>45</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -9018,13 +9011,13 @@
 <td>47</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.BufferChain.java">org/apache/hadoop/hbase/ipc/BufferChain.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9032,13 +9025,13 @@
 <td>48</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.IPCUtil.java">org/apache/hadoop/hbase/ipc/IPCUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -9046,57 +9039,57 @@
 <td>59</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.RpcServer.java">org/apache/hadoop/hbase/ipc/RpcServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>401</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>402</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>499</td></tr>
+<td>402</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>499</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>500</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.RpcServerFactory.java">org/apache/hadoop/hbase/ipc/RpcServerFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class RpcServerFactory should be declared as final.</td>
 <td>33</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>60</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9104,57 +9097,57 @@
 <td>61</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.SimpleRpcServer.java">org/apache/hadoop/hbase/ipc/SimpleRpcServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
 <td>72</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>220</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>223</td></tr>
+<td>220</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>223</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>258</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.SimpleRpcServerResponder.java">org/apache/hadoop/hbase/ipc/SimpleRpcServerResponder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
 <td>42</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>89</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9162,13 +9155,13 @@
 <td>96</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.SimpleServerCall.java">org/apache/hadoop/hbase/ipc/SimpleServerCall.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
@@ -9176,19 +9169,19 @@
 <td>37</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.SimpleServerRpcConnection.java">org/apache/hadoop/hbase/ipc/SimpleServerRpcConnection.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
 <td>55</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9196,13 +9189,13 @@
 <td>173</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.ipc.TestRWQueueRpcExecutor.java">org/apache/hadoop/hbase/ipc/TestRWQueueRpcExecutor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -9210,13 +9203,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.log.HBaseMarkers.java">org/apache/hadoop/hbase/log/HBaseMarkers.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -9224,13 +9217,13 @@
 <td>24</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.Driver.java">org/apache/hadoop/hbase/mapred/Driver.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -9238,19 +9231,19 @@
 <td>28</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.HRegionPartitioner.java">org/apache/hadoop/hbase/mapred/HRegionPartitioner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>37</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -9258,13 +9251,13 @@
 <td>38</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.MultiTableSnapshotInputFormat.java">org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -9272,19 +9265,19 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TableMapReduceUtil.java">org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>52</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -9292,51 +9285,51 @@
 <td>355</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TestGroupingTableMap.java">org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>87</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>120</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>168</td></tr>
+<td>120</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>168</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>179</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TestIdentityTableMap.java">org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>57</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9344,13 +9337,13 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TestRowCounter.java">org/apache/hadoop/hbase/mapred/TestRowCounter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9358,89 +9351,89 @@
 <td>90</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TestTableInputFormat.java">org/apache/hadoop/hbase/mapred/TestTableInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>276</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>286</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>UpperEll</td>
-<td>Should use uppercase 'L'.</td>
-<td>360</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
-<td>364</td></tr>
+<td>360</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
+<td>364</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>UpperEll</td>
+<td>Should use uppercase 'L'.</td>
 <td>368</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapred.TestTableMapReduceUtil.java">org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>182</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>202</td></tr>
+<td>182</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>202</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>215</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.CellCounter.java">org/apache/hadoop/hbase/mapreduce/CellCounter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>245</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>256</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9448,13 +9441,13 @@
 <td>282</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.CellSortReducer.java">org/apache/hadoop/hbase/mapreduce/CellSortReducer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9462,37 +9455,37 @@
 <td>53</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.CopyTable.java">org/apache/hadoop/hbase/mapreduce/CopyTable.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>230</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>231</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>239</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 108).</td>
 <td>242</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9500,13 +9493,13 @@
 <td>405</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.Driver.java">org/apache/hadoop/hbase/mapreduce/Driver.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -9514,13 +9507,13 @@
 <td>32</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.ExportUtils.java">org/apache/hadoop/hbase/mapreduce/ExportUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9528,13 +9521,13 @@
 <td>86</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.HFileOutputFormat2.java">org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -9542,107 +9535,107 @@
 <td>193</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.Import.java">org/apache/hadoop/hbase/mapreduce/Import.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>178</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>209</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>273</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>336</td></tr>
+<td>273</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>336</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>416</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.ImportTsv.java">org/apache/hadoop/hbase/mapreduce/ImportTsv.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>394</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>395</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>636</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>664</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>726</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>736</td></tr>
+<td>726</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>736</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>745</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.IntegrationTestBulkLoad.java">org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>187</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9650,19 +9643,19 @@
 <td>228</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.IntegrationTestImportTsv.java">org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>166</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9670,13 +9663,13 @@
 <td>174</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.MapreduceTestingShim.java">org/apache/hadoop/hbase/mapreduce/MapreduceTestingShim.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9684,13 +9677,13 @@
 <td>104</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.MultiTableInputFormatBase.java">org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9698,13 +9691,13 @@
 <td>158</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.MultiTableInputFormatTestBase.java">org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatTestBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9712,13 +9705,13 @@
 <td>153</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.MultiTableOutputFormat.java">org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9726,13 +9719,13 @@
 <td>132</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.MultiTableSnapshotInputFormat.java">org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -9740,13 +9733,13 @@
 <td>42</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.PutCombiner.java">org/apache/hadoop/hbase/mapreduce/PutCombiner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9754,13 +9747,13 @@
 <td>75</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.PutSortReducer.java">org/apache/hadoop/hbase/mapreduce/PutSortReducer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9768,13 +9761,13 @@
 <td>128</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.ResultSerialization.java">org/apache/hadoop/hbase/mapreduce/ResultSerialization.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9782,33 +9775,33 @@
 <td>115</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.RoundRobinTableInputFormat.java">org/apache/hadoop/hbase/mapreduce/RoundRobinTableInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
-<td>JavadocTagContinuationIndentation</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 14 has parse error. Details: mismatched input ':' expecting &lt;EOF&gt; while parsing JAVADOC</td>
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.SimpleTotalOrderPartitioner.java">org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>39</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9816,13 +9809,13 @@
 <td>105</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TableInputFormatBase.java">org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -9830,75 +9823,75 @@
 <td>608</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.java">org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>68</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>168</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>169</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>633</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>758</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>759</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>824</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>837</td></tr>
+<td>824</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>837</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>891</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat.java">org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -9906,13 +9899,13 @@
 <td>53</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormatImpl.java">org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -9920,13 +9913,13 @@
 <td>69</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestGroupingTableMapper.java">org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -9934,111 +9927,111 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat2.java">org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>198</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>199</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>262</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>263</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>284</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>345</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>417</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>529</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 169 lines (max allowed is 150).</td>
 <td>622</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1163</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>1183</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>1185</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>1382</td></tr>
+<td>1185</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>1382</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>1386</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestImportTSVWithVisibilityLabels.java">org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>367</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10046,13 +10039,13 @@
 <td>368</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestRoundRobinTableInputFormat.java">org/apache/hadoop/hbase/mapreduce/TestRoundRobinTableInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -10060,19 +10053,19 @@
 <td>106</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestRowCounter.java">org/apache/hadoop/hbase/mapreduce/TestRowCounter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>71</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -10080,45 +10073,45 @@
 <td>82</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestTableInputFormat.java">org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
 <td>Using the '.*' form of import should be avoided - org.mockito.Mockito.*.</td>
 <td>23</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>UpperEll</td>
-<td>Should use uppercase 'L'.</td>
-<td>360</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
-<td>364</td></tr>
+<td>360</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
+<td>364</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>UpperEll</td>
+<td>Should use uppercase 'L'.</td>
 <td>368</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TestTableInputFormatScanBase.java">org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10126,13 +10119,13 @@
 <td>133</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.TextSortReducer.java">org/apache/hadoop/hbase/mapreduce/TextSortReducer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10140,13 +10133,13 @@
 <td>194</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication.java">org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -10154,13 +10147,13 @@
 <td>517</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.AssignmentVerificationReport.java">org/apache/hadoop/hbase/master/AssignmentVerificationReport.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -10168,13 +10161,13 @@
 <td>85</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.ClusterSchemaServiceImpl.java">org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10182,49 +10175,49 @@
 <td>111</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.HMaster.java">org/apache/hadoop/hbase/master/HMaster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>832</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 424 lines (max allowed is 150).</td>
 <td>932</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1961</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3518</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>3520</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>3661</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10232,19 +10225,19 @@
 <td>3704</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.HMasterCommandLine.java">org/apache/hadoop/hbase/master/HMasterCommandLine.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>80</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10252,13 +10245,13 @@
 <td>255</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.MasterWalManager.java">org/apache/hadoop/hbase/master/MasterWalManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10266,13 +10259,13 @@
 <td>221</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.MockRegionServer.java">org/apache/hadoop/hbase/master/MockRegionServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10280,43 +10273,43 @@
 <td>256</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.RegionPlacementMaintainer.java">org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>131</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 246 lines (max allowed is 150).</td>
 <td>183</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>586</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>889</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 160 lines (max allowed is 150).</td>
 <td>898</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -10324,13 +10317,13 @@
 <td>898</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.ServerManager.java">org/apache/hadoop/hbase/master/ServerManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10338,13 +10331,13 @@
 <td>542</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.SnapshotOfRegionAssignmentFromMeta.java">org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10352,85 +10345,85 @@
 <td>212</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.SplitLogManager.java">org/apache/hadoop/hbase/master/SplitLogManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 143).</td>
 <td>157</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'installed' must be private and have accessor methods.</td>
 <td>479</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'done' must be private and have accessor methods.</td>
 <td>480</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'error' must be private and have accessor methods.</td>
 <td>481</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'isDead' must be private and have accessor methods.</td>
 <td>482</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'last_update' must be private and have accessor methods.</td>
 <td>495</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'last_version' must be private and have accessor methods.</td>
 <td>496</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'cur_worker_name' must be private and have accessor methods.</td>
 <td>497</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'batch' must be private and have accessor methods.</td>
 <td>498</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'status' must be private and have accessor methods.</td>
 <td>499</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'incarnation' must be private and have accessor methods.</td>
 <td>500</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'unforcedResubmits' must be private and have accessor methods.</td>
 <td>501</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -10438,13 +10431,13 @@
 <td>502</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.TestHMasterCommandLine.java">org/apache/hadoop/hbase/master/TestHMasterCommandLine.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -10452,13 +10445,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.TestMasterOperationsForRegionReplicas.java">org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10466,19 +10459,19 @@
 <td>169</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.TestMasterTransitions.java">org/apache/hadoop/hbase/master/TestMasterTransitions.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>309</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10486,45 +10479,45 @@
 <td>311</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.TestWarmupRegion.java">org/apache/hadoop/hbase/master/TestWarmupRegion.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>73</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>81</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>89</td></tr>
+<td>81</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
+<td>89</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
 <td>119</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.AssignProcedure.java">org/apache/hadoop/hbase/master/assignment/AssignProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10532,83 +10525,83 @@
 <td>135</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.RegionStateStore.java">org/apache/hadoop/hbase/master/assignment/RegionStateStore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>152</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>155</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>159</td></tr>
+<td>155</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>159</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>162</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.RegionStates.java">org/apache/hadoop/hbase/master/assignment/RegionStates.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>168</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>180</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>189</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>198</td></tr>
+<td>189</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>198</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>735</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.TestAssignmentOnRSCrash.java">org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10616,13 +10609,13 @@
 <td>110</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.TestRegionStates.java">org/apache/hadoop/hbase/master/assignment/TestRegionStates.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10630,19 +10623,19 @@
 <td>87</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.assignment.TestSplitTableRegionProcedure.java">org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>199</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10650,13 +10643,13 @@
 <td>223</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.BalancerClusterState.java">org/apache/hadoop/hbase/master/balancer/BalancerClusterState.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -10664,19 +10657,19 @@
 <td>131</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.BalancerTestBase.java">org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>336</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10684,13 +10677,13 @@
 <td>413</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.ClusterLoadState.java">org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10698,19 +10691,19 @@
 <td>48</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.RegionInfoComparator.java">org/apache/hadoop/hbase/master/balancer/RegionInfoComparator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>33</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10718,13 +10711,13 @@
 <td>34</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer.java">org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -10732,13 +10725,13 @@
 <td>255</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.TestBaseLoadBalancer.java">org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10746,19 +10739,19 @@
 <td>389</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.TestSimpleLoadBalancer.java">org/apache/hadoop/hbase/master/balancer/TestSimpleLoadBalancer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>98</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10766,13 +10759,13 @@
 <td>150</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.balancer.TestStochasticBalancerJmxMetrics.java">org/apache/hadoop/hbase/master/balancer/TestStochasticBalancerJmxMetrics.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10780,13 +10773,13 @@
 <td>208</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.cleaner.DirScanPool.java">org/apache/hadoop/hbase/master/cleaner/DirScanPool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -10794,19 +10787,19 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.cleaner.TestHFileCleaner.java">org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>242</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10814,19 +10807,19 @@
 <td>244</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.http.MasterStatusServlet.java">org/apache/hadoop/hbase/master/http/MasterStatusServlet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>72</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10834,13 +10827,13 @@
 <td>73</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.janitor.TestCatalogJanitor.java">org/apache/hadoop/hbase/master/janitor/TestCatalogJanitor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10848,13 +10841,13 @@
 <td>702</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.locking.LockManager.java">org/apache/hadoop/hbase/master/locking/LockManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10862,117 +10855,117 @@
 <td>244</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.locking.LockProcedure.java">org/apache/hadoop/hbase/master/locking/LockProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>207</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>210</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>237</td></tr>
+<td>210</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>237</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>341</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.normalizer.package-info.java">org/apache/hadoop/hbase/master/normalizer/package-info.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>42</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 116).</td>
 <td>43</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>46</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 116).</td>
 <td>47</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 127).</td>
 <td>50</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 125).</td>
 <td>51</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 115).</td>
 <td>54</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 128).</td>
 <td>55</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>57</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 114).</td>
 <td>58</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 127).</td>
 <td>59</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 107).</td>
 <td>61</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -10980,13 +10973,13 @@
 <td>62</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv.java">org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -10994,19 +10987,19 @@
 <td>126</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.MasterProcedureScheduler.java">org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>384</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11014,19 +11007,19 @@
 <td>723</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility.java">org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class MasterProcedureTestingUtility should be declared as final.</td>
 <td>74</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11034,13 +11027,13 @@
 <td>278</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.MasterProcedureUtil.java">org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11048,13 +11041,13 @@
 <td>135</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.ProcedureDescriber.java">org/apache/hadoop/hbase/master/procedure/ProcedureDescriber.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11062,13 +11055,13 @@
 <td>37</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.ProcedureSyncWait.java">org/apache/hadoop/hbase/master/procedure/ProcedureSyncWait.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11076,13 +11069,13 @@
 <td>219</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure.java">org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -11090,13 +11083,13 @@
 <td>135</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.TestMasterProcedureEvents.java">org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11104,13 +11097,13 @@
 <td>138</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.procedure.TestMasterProcedureSchedulerConcurrency.java">org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11118,13 +11111,13 @@
 <td>267</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.region.MasterRegionFactory.java">org/apache/hadoop/hbase/master/region/MasterRegionFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11132,13 +11125,13 @@
 <td>40</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.replication.RemovePeerProcedure.java">org/apache/hadoop/hbase/master/replication/RemovePeerProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -11146,19 +11139,19 @@
 <td>103</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.replication.TransitPeerSyncReplicationStateProcedure.java">org/apache/hadoop/hbase/master/replication/TransitPeerSyncReplicationStateProcedure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 158 lines (max allowed is 150).</td>
 <td>234</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -11166,13 +11159,13 @@
 <td>289</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.snapshot.EnabledTableSnapshotHandler.java">org/apache/hadoop/hbase/master/snapshot/EnabledTableSnapshotHandler.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11180,45 +11173,45 @@
 <td>78</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.snapshot.SnapshotManager.java">org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>260</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1187</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1244</td></tr>
+<td>1187</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1244</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1248</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.master.snapshot.TakeSnapshotHandler.java">org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11226,13 +11219,13 @@
 <td>272</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.CachedMobFile.java">org/apache/hadoop/hbase/mob/CachedMobFile.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11240,13 +11233,13 @@
 <td>57</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.DefaultMobStoreCompactor.java">org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -11254,13 +11247,13 @@
 <td>300</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.DefaultMobStoreFlusher.java">org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11268,13 +11261,13 @@
 <td>114</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.MobFileCleanerChore.java">org/apache/hadoop/hbase/mob/MobFileCleanerChore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -11282,13 +11275,13 @@
 <td>140</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.MobTestUtil.java">org/apache/hadoop/hbase/mob/MobTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11296,13 +11289,13 @@
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.RSMobFileCleanerChore.java">org/apache/hadoop/hbase/mob/RSMobFileCleanerChore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -11310,13 +11303,13 @@
 <td>82</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.TestMobWithByteBuffAllocator.java">org/apache/hadoop/hbase/mob/TestMobWithByteBuffAllocator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -11324,19 +11317,19 @@
 <td>103</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mob.mapreduce.MobRefReporter.java">org/apache/hadoop/hbase/mob/mapreduce/MobRefReporter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>whitespace</td>
 <td>FileTabCharacter</td>
 <td>File contains tab characters (this is the first instance).</td>
 <td>123</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -11344,19 +11337,19 @@
 <td>130</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.monitoring.MemoryBoundedLogMessageBuffer.java">org/apache/hadoop/hbase/monitoring/MemoryBoundedLogMessageBuffer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'message' must be private and have accessor methods.</td>
 <td>91</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -11364,13 +11357,13 @@
 <td>92</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.monitoring.MonitoredRPCHandlerImpl.java">org/apache/hadoop/hbase/monitoring/MonitoredRPCHandlerImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11378,19 +11371,19 @@
 <td>124</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mttr.IntegrationTestMTTR.java">org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>114</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
@@ -11398,13 +11391,13 @@
 <td>330</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.namequeues.LogHandlerUtils.java">org/apache/hadoop/hbase/namequeues/LogHandlerUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11412,13 +11405,13 @@
 <td>31</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.namequeues.NamedQueueRecorder.java">org/apache/hadoop/hbase/namequeues/NamedQueueRecorder.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11426,19 +11419,19 @@
 <td>40</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.nio.ByteBuff.java">org/apache/hadoop/hbase/nio/ByteBuff.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>473</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
@@ -11446,69 +11439,69 @@
 <td>473</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.nio.MultiByteBuff.java">org/apache/hadoop/hbase/nio/MultiByteBuff.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>458</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>593</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>610</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1031</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1077</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1180</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1181</td></tr>
+<td>1180</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1181</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1183</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.ProcedureManagerHost.java">org/apache/hadoop/hbase/procedure/ProcedureManagerHost.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11516,19 +11509,19 @@
 <td>56</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.SimpleRSProcedureManager.java">org/apache/hadoop/hbase/procedure/SimpleRSProcedureManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>155</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11536,49 +11529,49 @@
 <td>186</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.TestProcedureCoordinator.java">org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>92</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>145</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>146</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>177</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>178</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>326</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11586,13 +11579,13 @@
 <td>347</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.TestProcedureDescriber.java">org/apache/hadoop/hbase/procedure/TestProcedureDescriber.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -11600,13 +11593,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.ZKProcedureCoordinator.java">org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11614,25 +11607,25 @@
 <td>193</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.ZKProcedureUtil.java">org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'baseZNode' must be private and have accessor methods.</td>
 <td>49</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>224</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11640,13 +11633,13 @@
 <td>242</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.flush.MasterFlushTableProcedureManager.java">org/apache/hadoop/hbase/procedure/flush/MasterFlushTableProcedureManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11654,19 +11647,19 @@
 <td>138</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.procedure.flush.RegionServerFlushTableProcedureManager.java">org/apache/hadoop/hbase/procedure/flush/RegionServerFlushTableProcedureManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>293</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11674,25 +11667,25 @@
 <td>303</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.protobuf.ProtobufMagic.java">org/apache/hadoop/hbase/protobuf/ProtobufMagic.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class ProtobufMagic should be declared as final.</td>
 <td>25</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>41</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11700,13 +11693,13 @@
 <td>70</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.protobuf.ProtobufMessageConverter.java">org/apache/hadoop/hbase/protobuf/ProtobufMessageConverter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11714,19 +11707,19 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.protobuf.ReplicationProtobufUtil.java">org/apache/hadoop/hbase/protobuf/ReplicationProtobufUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>44</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11734,13 +11727,13 @@
 <td>147</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.DefaultOperationQuota.java">org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11748,13 +11741,13 @@
 <td>80</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.GlobalQuotaSettingsImpl.java">org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -11762,13 +11755,13 @@
 <td>167</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.NoopOperationQuota.java">org/apache/hadoop/hbase/quotas/NoopOperationQuota.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11776,13 +11769,13 @@
 <td>29</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.NoopQuotaLimiter.java">org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11790,13 +11783,13 @@
 <td>26</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.QuotaLimiterFactory.java">org/apache/hadoop/hbase/quotas/QuotaLimiterFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11804,13 +11797,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.QuotaSettingsFactory.java">org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11818,19 +11811,19 @@
 <td>33</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.QuotaTableUtil.java">org/apache/hadoop/hbase/quotas/QuotaTableUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>128</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11838,39 +11831,39 @@
 <td>518</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.QuotaUtil.java">org/apache/hadoop/hbase/quotas/QuotaUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>290</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>385</td></tr>
+<td>290</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>385</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>389</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.SpaceQuotaHelperForTests.java">org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11878,13 +11871,13 @@
 <td>472</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshotNotifierFactory.java">org/apache/hadoop/hbase/quotas/SpaceQuotaSnapshotNotifierFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11892,13 +11885,13 @@
 <td>28</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.SpaceViolationPolicyEnforcementFactory.java">org/apache/hadoop/hbase/quotas/SpaceViolationPolicyEnforcementFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11906,13 +11899,13 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.TestQuotaSettingsFactory.java">org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -11920,13 +11913,13 @@
 <td>56</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.TimeBasedLimiter.java">org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -11934,39 +11927,39 @@
 <td>32</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.UserQuotaState.java">org/apache/hadoop/hbase/quotas/UserQuotaState.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>57</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>193</td></tr>
+<td>57</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>193</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>197</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.quotas.policies.BaseViolationPolicyEnforcement.java">org/apache/hadoop/hbase/quotas/policies/BaseViolationPolicyEnforcement.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -11974,13 +11967,13 @@
 <td>26</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.AbstractMemStore.java">org/apache/hadoop/hbase/regionserver/AbstractMemStore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -11988,13 +11981,13 @@
 <td>236</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.CellArrayMap.java">org/apache/hadoop/hbase/regionserver/CellArrayMap.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12002,13 +11995,13 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.ChunkCreator.java">org/apache/hadoop/hbase/regionserver/ChunkCreator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12016,19 +12009,19 @@
 <td>413</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.CompactedHFilesDischarger.java">org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>83</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12036,13 +12029,13 @@
 <td>85</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.CompactingMemStore.java">org/apache/hadoop/hbase/regionserver/CompactingMemStore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12050,19 +12043,19 @@
 <td>590</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.CompositeImmutableSegment.java">org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>65</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12070,19 +12063,19 @@
 <td>124</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.CreateRandomStoreFile.java">org/apache/hadoop/hbase/regionserver/CreateRandomStoreFile.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>169</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12090,13 +12083,13 @@
 <td>284</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.DefaultStoreFlusher.java">org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12104,13 +12097,13 @@
 <td>51</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.FlushPolicyFactory.java">org/apache/hadoop/hbase/regionserver/FlushPolicyFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -12118,115 +12111,115 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.HRegion.java">org/apache/hadoop/hbase/regionserver/HRegion.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 274 lines (max allowed is 150).</td>
 <td>1690</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2015</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2022</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2427</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>2825</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2894</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2997</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>4852</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>5200</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>5214</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 199 lines (max allowed is 150).</td>
 <td>5575</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 214 lines (max allowed is 150).</td>
 <td>7252</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>8477</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>8478</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>8480</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>8481</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>8493</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12234,99 +12227,99 @@
 <td>8494</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.HRegionFileSystem.java">org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>208</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>400</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>421</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>433</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>488</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>994</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1083</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1106</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1131</td></tr>
+<td>1106</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1131</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1170</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.HRegionServer.java">org/apache/hadoop/hbase/regionserver/HRegionServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'TEST_SKIP_REPORTING_TRANSITION' must be private and have accessor methods.</td>
 <td>247</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 228 lines (max allowed is 150).</td>
 <td>787</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>929</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -12334,13 +12327,13 @@
 <td>1803</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.HRegionServerCommandLine.java">org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -12348,31 +12341,31 @@
 <td>82</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.HStore.java">org/apache/hadoop/hbase/regionserver/HStore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'synchronized' has incorrect indentation level 6, expected level should be 8.</td>
 <td>1263</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'synchronized' child has incorrect indentation level 8, expected level should be 10.</td>
 <td>1264</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'synchronized rcurly' has incorrect indentation level 6, expected level should be 8.</td>
 <td>1265</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
@@ -12380,19 +12373,19 @@
 <td>1266</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.MemStoreFlusher.java">org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class FlushHandler should be declared as final.</td>
 <td>306</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12400,13 +12393,13 @@
 <td>501</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.java">org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -12414,13 +12407,13 @@
 <td>303</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.MetricsRegionServerWrapperImpl.java">org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -12428,13 +12421,13 @@
 <td>790</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.MetricsUserAggregateFactory.java">org/apache/hadoop/hbase/regionserver/MetricsUserAggregateFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -12442,13 +12435,13 @@
 <td>23</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.OnlineRegions.java">org/apache/hadoop/hbase/regionserver/OnlineRegions.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -12456,13 +12449,13 @@
 <td>45</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RSAnnotationReadingPriorityFunction.java">org/apache/hadoop/hbase/regionserver/RSAnnotationReadingPriorityFunction.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12470,43 +12463,43 @@
 <td>129</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RSRpcServices.java">org/apache/hadoop/hbase/regionserver/RSRpcServices.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>539</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 161 lines (max allowed is 150).</td>
 <td>704</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>1215</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 231 lines (max allowed is 150).</td>
 <td>2623</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 226 lines (max allowed is 150).</td>
 <td>3254</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -12514,115 +12507,115 @@
 <td>3488</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RSSnapshotVerifier.java">org/apache/hadoop/hbase/regionserver/RSSnapshotVerifier.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 111).</td>
 <td>94</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>95</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>96</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>97</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>98</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>99</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>100</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>101</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>102</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>103</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>104</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
 <td>105</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>106</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>107</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 106).</td>
 <td>108</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>109</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 109).</td>
 <td>110</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -12630,31 +12623,31 @@
 <td>111</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RegionAsTable.java">org/apache/hadoop/hbase/regionserver/RegionAsTable.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>90</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>155</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>203</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12662,13 +12655,13 @@
 <td>214</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost.java">org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12676,13 +12669,13 @@
 <td>1350</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RegionScannerImpl.java">org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -12690,13 +12683,13 @@
 <td>413</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RegionServerServices.java">org/apache/hadoop/hbase/regionserver/RegionServerServices.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
@@ -12704,13 +12697,13 @@
 <td>223</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.RegionSplitPolicy.java">org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -12718,25 +12711,25 @@
 <td>126</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.ScanOptions.java">org/apache/hadoop/hbase/regionserver/ScanOptions.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 131).</td>
 <td>40</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 133).</td>
 <td>42</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -12744,63 +12737,63 @@
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.ServerNonceManager.java">org/apache/hadoop/hbase/regionserver/ServerNonceManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>147</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>152</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>177</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>238</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>241</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>273</td></tr>
+<td>241</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>273</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>275</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.ShutdownHook.java">org/apache/hadoop/hbase/regionserver/ShutdownHook.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -12808,13 +12801,13 @@
 <td>39</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreEngine.java">org/apache/hadoop/hbase/regionserver/StoreEngine.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
@@ -12822,13 +12815,13 @@
 <td>407</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreFileComparators.java">org/apache/hadoop/hbase/regionserver/StoreFileComparators.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -12836,83 +12829,83 @@
 <td>28</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreFileReader.java">org/apache/hadoop/hbase/regionserver/StoreFileReader.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>508</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>525</td></tr>
+<td>508</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>525</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>639</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreFileScanner.java">org/apache/hadoop/hbase/regionserver/StoreFileScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>211</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>239</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>294</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>440</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>494</td></tr>
+<td>440</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>494</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>502</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreFileWriter.java">org/apache/hadoop/hbase/regionserver/StoreFileWriter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -12920,63 +12913,63 @@
 <td>79</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StoreScanner.java">org/apache/hadoop/hbase/regionserver/StoreScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 250 lines (max allowed is 150).</td>
 <td>540</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>774</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>907</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>934</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1186</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1221</td></tr>
+<td>1186</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>1221</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1222</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StorefileRefresherChore.java">org/apache/hadoop/hbase/regionserver/StorefileRefresherChore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12984,13 +12977,13 @@
 <td>90</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StripeMultiFileWriter.java">org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -12998,93 +12991,93 @@
 <td>198</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.StripeStoreFileManager.java">org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'stripeEndRows' must be private and have accessor methods.</td>
 <td>92</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'stripeFiles' must be private and have accessor methods.</td>
 <td>99</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'level0Files' must be private and have accessor methods.</td>
 <td>101</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'allFilesCached' must be private and have accessor methods.</td>
 <td>104</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>512</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>513</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>517</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>581</td></tr>
+<td>517</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>581</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>589</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestAtomicOperation.java">org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>277</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>571</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>572</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -13092,19 +13085,19 @@
 <td>730</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestBlocksScanned.java">org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>118</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -13112,13 +13105,13 @@
 <td>119</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestBulkloadBase.java">org/apache/hadoop/hbase/regionserver/TestBulkloadBase.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13126,39 +13119,39 @@
 <td>179</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestCellFlatSet.java">org/apache/hadoop/hbase/regionserver/TestCellFlatSet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>67</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>69</td></tr>
+<td>67</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>69</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>292</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestCellSkipListSet.java">org/apache/hadoop/hbase/regionserver/TestCellSkipListSet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13166,19 +13159,19 @@
 <td>164</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestClearRegionBlockCache.java">org/apache/hadoop/hbase/regionserver/TestClearRegionBlockCache.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>180</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -13186,43 +13179,43 @@
 <td>181</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestColumnSeeking.java">org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>152</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>167</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>168</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>261</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>276</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -13230,13 +13223,13 @@
 <td>277</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestCompaction.java">org/apache/hadoop/hbase/regionserver/TestCompaction.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13244,19 +13237,19 @@
 <td>609</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestCompactionState.java">org/apache/hadoop/hbase/regionserver/TestCompactionState.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>216</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13264,87 +13257,87 @@
 <td>217</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestCompoundBloomFilter.java">org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>78</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>82</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>89</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>100</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>106</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'for' construct must use '{}'s.</td>
-<td>116</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
-<td>147</td></tr>
+<td>116</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'for' construct must use '{}'s.</td>
+<td>147</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>314</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestDefaultMemStore.java">org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>311</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>513</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>1083</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13352,13 +13345,13 @@
 <td>1100</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestFSErrorsExposed.java">org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13366,19 +13359,19 @@
 <td>224</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestFailedAppendAndSync.java">org/apache/hadoop/hbase/regionserver/TestFailedAppendAndSync.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>299</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13386,91 +13379,91 @@
 <td>307</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHRegion.java">org/apache/hadoop/hbase/regionserver/TestHRegion.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1467</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1468</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1484</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1485</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>4461</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>4462</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class PutThread should be declared as final.</td>
 <td>4650</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>4822</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>4885</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>5035</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>5046</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>5047</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>5065</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13478,57 +13471,57 @@
 <td>5740</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHRegionFileSystem.java">org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>287</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>293</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>299</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>332</td></tr>
+<td>299</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>332</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>344</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHRegionOnCluster.java">org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>151</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13536,101 +13529,101 @@
 <td>166</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHRegionReplayEvents.java">org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>316</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>778</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>872</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>EmptyBlock</td>
-<td>Must have at least one statement.</td>
-<td>876</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
-<td>1032</td></tr>
+<td>876</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
+<td>1032</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>EmptyBlock</td>
+<td>Must have at least one statement.</td>
 <td>1443</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHRegionServerBulkLoad.java">org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>184</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>247</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>253</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>273</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>274</td></tr>
+<td>273</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>274</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>379</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestHStoreFile.java">org/apache/hadoop/hbase/regionserver/TestHStoreFile.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -13638,13 +13631,13 @@
 <td>424</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestKeyValueScanFixture.java">org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -13652,19 +13645,19 @@
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestMajorCompaction.java">org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>475</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13672,31 +13665,31 @@
 <td>494</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestMultiColumnScanner.java">org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>123</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>160</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>180</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13704,13 +13697,13 @@
 <td>188</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestMultiVersionConcurrencyControl.java">org/apache/hadoop/hbase/regionserver/TestMultiVersionConcurrencyControl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13718,19 +13711,19 @@
 <td>65</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestRSKilledWhenInitializing.java">org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>135</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13738,37 +13731,37 @@
 <td>178</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestRegionIncrement.java">org/apache/hadoop/hbase/regionserver/TestRegionIncrement.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>103</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>198</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>202</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>233</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13776,13 +13769,13 @@
 <td>237</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestRegionReplicasWithRestartScenarios.java">org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithRestartScenarios.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -13790,43 +13783,43 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestResettingCounters.java">org/apache/hadoop/hbase/regionserver/TestResettingCounters.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>70</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>74</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>99</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>100</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>105</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13834,81 +13827,81 @@
 <td>110</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestReversibleScanners.java">org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>201</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>206</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>214</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>228</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>339</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>345</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>432</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>605</td></tr>
+<td>432</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>605</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>621</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestScanWithBloomError.java">org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>153</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13916,45 +13909,45 @@
 <td>181</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages.java">org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>634</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>636</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>653</td></tr>
+<td>636</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>653</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>655</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestScannerRPCScanMetrics.java">org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -13962,13 +13955,13 @@
 <td>125</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestScannerRetriableFailure.java">org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13976,13 +13969,13 @@
 <td>170</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestSecureBulkloadListener.java">org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -13990,19 +13983,19 @@
 <td>259</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestSeekOptimizations.java">org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>331</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -14010,19 +14003,19 @@
 <td>441</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestServerNonceManager.java">org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>236</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14030,69 +14023,69 @@
 <td>260</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestSplitTransactionOnCluster.java">org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>760</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>787</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1032</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1055</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1056</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1097</td></tr>
+<td>1056</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>1097</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>1143</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestTags.java">org/apache/hadoop/hbase/regionserver/TestTags.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>304</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14100,13 +14093,13 @@
 <td>615</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestWALLockup.java">org/apache/hadoop/hbase/regionserver/TestWALLockup.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14114,13 +14107,13 @@
 <td>148</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestWALMonotonicallyIncreasingSeqId.java">org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -14128,19 +14121,19 @@
 <td>235</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.TestWalAndCompactingMemStoreFlush.java">org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 222 lines (max allowed is 150).</td>
 <td>137</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -14148,31 +14141,31 @@
 <td>363</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.compactions.CompactionProgress.java">org/apache/hadoop/hbase/regionserver/compactions/CompactionProgress.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'totalCompactingKVs' must be private and have accessor methods.</td>
 <td>35</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'currentCompactedKVs' must be private and have accessor methods.</td>
 <td>37</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'totalCompactedSize' must be private and have accessor methods.</td>
 <td>39</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -14180,55 +14173,55 @@
 <td>60</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.compactions.Compactor.java">org/apache/hadoop/hbase/regionserver/compactions/Compactor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxKeyCount' must be private and have accessor methods.</td>
 <td>136</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'earliestPutTs' must be private and have accessor methods.</td>
 <td>138</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'latestPutTs' must be private and have accessor methods.</td>
 <td>140</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxSeqId' must be private and have accessor methods.</td>
 <td>142</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxMVCCReadpoint' must be private and have accessor methods.</td>
 <td>144</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxTagsLength' must be private and have accessor methods.</td>
 <td>146</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'minSeqIdToKeep' must be private and have accessor methods.</td>
 <td>148</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -14236,13 +14229,13 @@
 <td>215</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.compactions.CurrentHourProvider.java">org/apache/hadoop/hbase/regionserver/compactions/CurrentHourProvider.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -14250,63 +14243,63 @@
 <td>26</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.compactions.StripeCompactionPolicy.java">org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>191</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>209</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>332</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>351</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>357</td></tr>
+<td>351</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>357</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>490</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.compactions.TestCompactor.java">org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>57</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14314,13 +14307,13 @@
 <td>206</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler.java">org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14328,51 +14321,51 @@
 <td>201</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.http.RSStatusServlet.java">org/apache/hadoop/hbase/regionserver/http/RSStatusServlet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>49</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>50</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>51</td></tr>
+<td>50</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>51</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>52</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.querymatcher.NewVersionBehaviorTracker.java">org/apache/hadoop/hbase/regionserver/querymatcher/NewVersionBehaviorTracker.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'ts' must be private and have accessor methods.</td>
 <td>108</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -14380,13 +14373,13 @@
 <td>109</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.querymatcher.TestScanDeleteTracker.java">org/apache/hadoop/hbase/regionserver/querymatcher/TestScanDeleteTracker.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -14394,19 +14387,19 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.snapshot.RegionServerSnapshotManager.java">org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>356</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14414,13 +14407,13 @@
 <td>365</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.AbstractProtobufLogWriter.java">org/apache/hadoop/hbase/regionserver/wal/AbstractProtobufLogWriter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -14428,19 +14421,19 @@
 <td>243</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.AbstractTestLogRolling.java">org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>290</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14448,51 +14441,51 @@
 <td>291</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.Compressor.java">org/apache/hadoop/hbase/regionserver/wal/Compressor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>43</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
-<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
-<td>104</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
-<td>138</td></tr>
+<td>104</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
+<td>138</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>annotation</td>
+<td>MissingDeprecated</td>
+<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
 <td>175</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.FSHLog.java">org/apache/hadoop/hbase/regionserver/wal/FSHLog.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 109).</td>
 <td>237</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -14500,19 +14493,19 @@
 <td>586</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.TestLogRolling.java">org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 178 lines (max allowed is 150).</td>
 <td>109</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14520,19 +14513,19 @@
 <td>572</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.TestLogRollingNoCluster.java">org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>182</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14540,13 +14533,13 @@
 <td>183</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.WALCoprocessorHost.java">org/apache/hadoop/hbase/regionserver/wal/WALCoprocessorHost.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -14554,13 +14547,13 @@
 <td>50</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.regionserver.wal.WALUtil.java">org/apache/hadoop/hbase/regionserver/wal/WALUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -14568,13 +14561,13 @@
 <td>59</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.ReplicationLoadSink.java">org/apache/hadoop/hbase/replication/ReplicationLoadSink.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -14582,13 +14575,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.ReplicationPeerConfig.java">org/apache/hadoop/hbase/replication/ReplicationPeerConfig.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -14596,19 +14589,19 @@
 <td>37</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.TestRemovePeerProcedureWaitForSCP.java">org/apache/hadoop/hbase/replication/TestRemovePeerProcedureWaitForSCP.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
 <td>Using the '.*' form of import should be avoided - org.hamcrest.MatcherAssert.*.</td>
 <td>20</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -14616,13 +14609,13 @@
 <td>21</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.regionserver.ReplicationLoad.java">org/apache/hadoop/hbase/replication/regionserver/ReplicationLoad.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14630,13 +14623,13 @@
 <td>127</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface.java">org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -14644,13 +14637,13 @@
 <td>205</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.regionserver.ReplicationSyncUp.java">org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -14658,51 +14651,51 @@
 <td>200</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.replication.regionserver.TestReplicationSink.java">org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>126</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>145</td></tr>
+<td>126</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
+<td>145</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
+<td>At-clause should have a non-empty description.</td>
 <td>154</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.RESTServer.java">org/apache/hadoop/hbase/rest/RESTServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'conf' must be private and have accessor methods.</td>
 <td>111</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>243</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -14710,19 +14703,19 @@
 <td>255</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.RESTServlet.java">org/apache/hadoop/hbase/rest/RESTServlet.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>148</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14730,13 +14723,13 @@
 <td>149</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.RowResource.java">org/apache/hadoop/hbase/rest/RowResource.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -14744,19 +14737,19 @@
 <td>290</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.RowSpec.java">org/apache/hadoop/hbase/rest/RowSpec.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>70</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14764,13 +14757,13 @@
 <td>87</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.client.Client.java">org/apache/hadoop/hbase/rest/client/Client.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14778,139 +14771,139 @@
 <td>328</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.model.ScannerModel.java">org/apache/hadoop/hbase/rest/model/ScannerModel.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'type' must be private and have accessor methods.</td>
 <td>133</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'value' must be private and have accessor methods.</td>
 <td>135</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'op' must be private and have accessor methods.</td>
 <td>137</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'type' must be private and have accessor methods.</td>
 <td>208</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'op' must be private and have accessor methods.</td>
 <td>210</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'value' must be private and have accessor methods.</td>
 <td>214</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'filters' must be private and have accessor methods.</td>
 <td>216</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'limit' must be private and have accessor methods.</td>
 <td>218</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'offset' must be private and have accessor methods.</td>
 <td>220</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'family' must be private and have accessor methods.</td>
 <td>222</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'qualifier' must be private and have accessor methods.</td>
 <td>224</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'ifMissing' must be private and have accessor methods.</td>
 <td>226</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'latestVersion' must be private and have accessor methods.</td>
 <td>228</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'minColumn' must be private and have accessor methods.</td>
 <td>230</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'minColumnInclusive' must be private and have accessor methods.</td>
 <td>232</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxColumn' must be private and have accessor methods.</td>
 <td>234</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'maxColumnInclusive' must be private and have accessor methods.</td>
 <td>236</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'dropDependentColumn' must be private and have accessor methods.</td>
 <td>238</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'chance' must be private and have accessor methods.</td>
 <td>240</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'prefixes' must be private and have accessor methods.</td>
 <td>242</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'timestamps' must be private and have accessor methods.</td>
 <td>246</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14918,13 +14911,13 @@
 <td>841</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.model.TableRegionModel.java">org/apache/hadoop/hbase/rest/model/TableRegionModel.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -14932,19 +14925,19 @@
 <td>124</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.model.TestScannerModel.java">org/apache/hadoop/hbase/rest/model/TestScannerModel.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 117).</td>
 <td>57</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -14952,13 +14945,13 @@
 <td>58</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.rest.model.VersionModel.java">org/apache/hadoop/hbase/rest/model/VersionModel.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -14966,13 +14959,13 @@
 <td>75</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.AbstractTestSecureIPC.java">org/apache/hadoop/hbase/security/AbstractTestSecureIPC.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -14980,13 +14973,13 @@
 <td>344</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.AuthMethod.java">org/apache/hadoop/hbase/security/AuthMethod.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -14994,13 +14987,13 @@
 <td>36</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.HBaseSaslRpcClient.java">org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -15008,13 +15001,13 @@
 <td>216</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.SaslUtil.java">org/apache/hadoop/hbase/security/SaslUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15022,13 +15015,13 @@
 <td>34</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.SecurityUtil.java">org/apache/hadoop/hbase/security/SecurityUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15036,13 +15029,13 @@
 <td>26</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.TestUser.java">org/apache/hadoop/hbase/security/TestUser.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -15050,13 +15043,13 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.User.java">org/apache/hadoop/hbase/security/User.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15064,13 +15057,13 @@
 <td>299</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.AccessControlClient.java">org/apache/hadoop/hbase/security/access/AccessControlClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15078,13 +15071,13 @@
 <td>40</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.AccessControlFilter.java">org/apache/hadoop/hbase/security/access/AccessControlFilter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
@@ -15092,13 +15085,13 @@
 <td>165</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.AccessControlUtil.java">org/apache/hadoop/hbase/security/access/AccessControlUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -15106,19 +15099,19 @@
 <td>45</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.AccessController.java">org/apache/hadoop/hbase/security/access/AccessController.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 169 lines (max allowed is 150).</td>
 <td>435</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15126,25 +15119,25 @@
 <td>549</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.SecureTestUtil.java">org/apache/hadoop/hbase/security/access/SecureTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>70</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>117</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -15152,25 +15145,25 @@
 <td>262</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.ShadedAccessControlUtil.java">org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>46</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>148</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15178,25 +15171,25 @@
 <td>149</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestAccessController.java">org/apache/hadoop/hbase/security/access/TestAccessController.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>930</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 243 lines (max allowed is 150).</td>
 <td>1344</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15204,19 +15197,19 @@
 <td>1810</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestAccessController2.java">org/apache/hadoop/hbase/security/access/TestAccessController2.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
 <td>304</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>EmptyBlock</td>
@@ -15224,13 +15217,13 @@
 <td>330</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestCellACLs.java">org/apache/hadoop/hbase/security/access/TestCellACLs.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15238,13 +15231,13 @@
 <td>151</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestHDFSAclHelper.java">org/apache/hadoop/hbase/security/access/TestHDFSAclHelper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -15252,31 +15245,31 @@
 <td>32</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestNamespaceCommands.java">org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>253</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 106).</td>
 <td>254</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>255</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -15284,43 +15277,43 @@
 <td>256</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.TestWithDisabledAuthorization.java">org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 162 lines (max allowed is 150).</td>
 <td>235</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 296 lines (max allowed is 150).</td>
 <td>458</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>684</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 106).</td>
 <td>685</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
 <td>686</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -15328,13 +15321,13 @@
 <td>687</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.access.ZKPermissionWatcher.java">org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15342,13 +15335,13 @@
 <td>232</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.token.SecureTestCluster.java">org/apache/hadoop/hbase/security/token/SecureTestCluster.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15356,13 +15349,13 @@
 <td>36</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.token.TestZKSecretWatcher.java">org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15370,19 +15363,19 @@
 <td>137</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.token.TokenUtil.java">org/apache/hadoop/hbase/security/token/TokenUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>41</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -15390,19 +15383,19 @@
 <td>116</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.CellVisibility.java">org/apache/hadoop/hbase/security/visibility/CellVisibility.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>63</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15410,45 +15403,45 @@
 <td>64</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.DefaultVisibilityLabelServiceImpl.java">org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>364</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>400</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>627</td></tr>
+<td>400</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>627</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>672</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.ExpAsStringVisibilityLabelServiceImpl.java">org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15456,13 +15449,13 @@
 <td>430</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.ExpressionParser.java">org/apache/hadoop/hbase/security/visibility/ExpressionParser.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15470,19 +15463,19 @@
 <td>76</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.LabelFilteringScanLabelGenerator.java">org/apache/hadoop/hbase/security/visibility/LabelFilteringScanLabelGenerator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>45</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15490,13 +15483,13 @@
 <td>48</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestExpressionExpander.java">org/apache/hadoop/hbase/security/visibility/TestExpressionExpander.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15504,13 +15497,13 @@
 <td>41</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestExpressionParser.java">org/apache/hadoop/hbase/security/visibility/TestExpressionParser.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15518,13 +15511,13 @@
 <td>44</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestVisibilityLabelsReplication.java">org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -15532,13 +15525,13 @@
 <td>121</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestVisibilityLabelsWithDefaultVisLabelService.java">org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15546,13 +15539,13 @@
 <td>148</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestVisibilityLabelsWithDeletes.java">org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15560,13 +15553,13 @@
 <td>2582</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.TestVisibilityLablesWithGroups.java">org/apache/hadoop/hbase/security/visibility/TestVisibilityLablesWithGroups.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -15574,13 +15567,13 @@
 <td>119</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityClient.java">org/apache/hadoop/hbase/security/visibility/VisibilityClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15588,13 +15581,13 @@
 <td>52</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityConstants.java">org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15602,13 +15595,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityController.java">org/apache/hadoop/hbase/security/visibility/VisibilityController.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -15616,13 +15609,13 @@
 <td>578</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityLabelServiceManager.java">org/apache/hadoop/hbase/security/visibility/VisibilityLabelServiceManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -15630,13 +15623,13 @@
 <td>30</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityLabelsCache.java">org/apache/hadoop/hbase/security/visibility/VisibilityLabelsCache.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -15644,13 +15637,13 @@
 <td>48</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityLabelsValidator.java">org/apache/hadoop/hbase/security/visibility/VisibilityLabelsValidator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15658,13 +15651,13 @@
 <td>26</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityNewVersionBehaivorTracker.java">org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -15672,13 +15665,13 @@
 <td>55</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil.java">org/apache/hadoop/hbase/security/visibility/VisibilityTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15686,13 +15679,13 @@
 <td>28</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.security.visibility.VisibilityUtils.java">org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15700,173 +15693,173 @@
 <td>72</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil.java">org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>349</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>414</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>511</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>523</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>587</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1438</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1440</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1516</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1522</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1652</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1790</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 106).</td>
 <td>2018</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 110).</td>
 <td>2019</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2096</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2248</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2257</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>2284</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>2293</td></tr>
+<td>2284</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>2293</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>3103</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter.java">org/apache/hadoop/hbase/shaded/protobuf/ResponseConverter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>255</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>265</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>295</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>305</td></tr>
+<td>295</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>305</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>414</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.slowlog.SlowLogTableAccessor.java">org/apache/hadoop/hbase/slowlog/SlowLogTableAccessor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -15874,81 +15867,81 @@
 <td>44</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.ExportSnapshot.java">org/apache/hadoop/hbase/snapshot/ExportSnapshot.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>290</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>291</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>552</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>555</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>559</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>562</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>828</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>829</td></tr>
+<td>828</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>829</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 191 lines (max allowed is 150).</td>
 <td>965</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.MobSnapshotTestingUtils.java">org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>44</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -15956,57 +15949,57 @@
 <td>132</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper.java">org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>369</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>409</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>424</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>439</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>601</td></tr>
+<td>439</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>601</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>776</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils.java">org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16014,57 +16007,57 @@
 <td>444</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.SnapshotInfo.java">org/apache/hadoop/hbase/snapshot/SnapshotInfo.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>138</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>139</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>140</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>339</td></tr>
+<td>140</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>339</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>485</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.SnapshotManifest.java">org/apache/hadoop/hbase/snapshot/SnapshotManifest.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>346</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16072,13 +16065,13 @@
 <td>472</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.SnapshotManifestV2.java">org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16086,19 +16079,19 @@
 <td>146</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils.java">org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>556</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16106,105 +16099,105 @@
 <td>589</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestBigLinkedList.java">org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>636</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>695</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>699</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>UpperEll</td>
 <td>Should use uppercase 'L'.</td>
 <td>702</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>914</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>999</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1001</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1034</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1280</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1304</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1307</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1626</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1633</td></tr>
+<td>1626</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>1633</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1634</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestBigLinkedListWithVisibility.java">org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithVisibility.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16212,43 +16205,43 @@
 <td>336</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestLoadAndVerify.java">org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>454</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>470</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>487</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>489</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>498</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -16256,13 +16249,13 @@
 <td>638</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java">org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -16270,19 +16263,19 @@
 <td>66</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestTimeBoundedRequestsWithRegionReplicas.java">org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>227</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16290,13 +16283,13 @@
 <td>347</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.test.IntegrationTestWithCellVisibilityLoadAndVerify.java">org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -16304,13 +16297,13 @@
 <td>401</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.thrift.TestThriftServer.java">org/apache/hadoop/hbase/thrift/TestThriftServer.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16318,13 +16311,13 @@
 <td>732</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.thrift2.DemoClient.java">org/apache/hadoop/hbase/thrift2/DemoClient.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
@@ -16332,13 +16325,13 @@
 <td>109</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.tool.MapreduceTestingShim.java">org/apache/hadoop/hbase/tool/MapreduceTestingShim.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16346,19 +16339,19 @@
 <td>104</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.tool.TestBulkLoadHFilesSplitRecovery.java">org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>246</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -16366,27 +16359,27 @@
 <td>549</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.trace.OpenTelemetryClassRule.java">org/apache/hadoop/hbase/trace/OpenTelemetryClassRule.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
-<td>JavadocTagContinuationIndentation</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 20 has parse error. Missed HTML close tag 'SpanData'. Sometimes it means that close tag missed for one of previous tags.</td>
 <td>65</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.AbstractHBaseTool.java">org/apache/hadoop/hbase/util/AbstractHBaseTool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -16394,25 +16387,25 @@
 <td>282</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Addressing.java">org/apache/hadoop/hbase/util/Addressing.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>32</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>121</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16420,299 +16413,299 @@
 <td>125</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.AvlUtil.java">org/apache/hadoop/hbase/util/AvlUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>157</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>203</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>230</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>234</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>238</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>258</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>428</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>522</td></tr>
+<td>428</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>522</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>523</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.BoundedPriorityBlockingQueue.java">org/apache/hadoop/hbase/util/BoundedPriorityBlockingQueue.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>87</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>189</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>312</td></tr>
+<td>189</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>312</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>313</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Bytes.java">org/apache/hadoop/hbase/util/Bytes.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>542</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>556</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>577</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>578</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>602</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1465</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1466</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1467</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1468</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1473</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1505</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1518</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1519</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1520</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1712</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1790</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1791</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1795</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1796</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1823</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1897</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1899</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1901</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1927</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1929</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1931</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1957</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1984</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2009</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>2026</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>2037</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2050</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16720,81 +16713,81 @@
 <td>2063</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ClassSize.java">org/apache/hadoop/hbase/util/ClassSize.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>33</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>360</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>370</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>371</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>372</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>373</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>374</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>375</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>376</td></tr>
+<td>375</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>376</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>377</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Classes.java">org/apache/hadoop/hbase/util/Classes.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -16802,13 +16795,13 @@
 <td>25</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.CompressionTest.java">org/apache/hadoop/hbase/util/CompressionTest.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -16816,24 +16809,18 @@
 <td>52</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ConcurrentMapUtils.java">org/apache/hadoop/hbase/util/ConcurrentMapUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>28</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>coding</td>
-<td>InnerAssignment</td>
-<td>Inner assignments should be avoided.</td>
-<td>59</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
@@ -16845,16 +16832,22 @@
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
+<td>59</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>coding</td>
+<td>InnerAssignment</td>
+<td>Inner assignments should be avoided.</td>
 <td>60</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ConnectionCache.java">org/apache/hadoop/hbase/util/ConnectionCache.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16862,13 +16855,13 @@
 <td>129</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.CoprocessorClassLoader.java">org/apache/hadoop/hbase/util/CoprocessorClassLoader.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -16876,19 +16869,19 @@
 <td>71</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.DirectMemoryUtils.java">org/apache/hadoop/hbase/util/DirectMemoryUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>42</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -16896,13 +16889,13 @@
 <td>86</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.EncryptionTest.java">org/apache/hadoop/hbase/util/EncryptionTest.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -16910,13 +16903,13 @@
 <td>36</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.EnvironmentEdgeManager.java">org/apache/hadoop/hbase/util/EnvironmentEdgeManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -16924,69 +16917,69 @@
 <td>56</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.FSUtils.java">org/apache/hadoop/hbase/util/FSUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>456</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>566</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>646</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>900</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 115).</td>
 <td>1413</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1466</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>1478</td></tr>
+<td>1466</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>1478</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>1688</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.GetJavaProperty.java">org/apache/hadoop/hbase/util/GetJavaProperty.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -16994,19 +16987,19 @@
 <td>27</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HBaseConfTool.java">org/apache/hadoop/hbase/util/HBaseConfTool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>27</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -17014,187 +17007,187 @@
 <td>29</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HBaseFsck.java">org/apache/hadoop/hbase/util/HBaseFsck.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>674</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>820</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'regionName' must be private and have accessor methods.</td>
 <td>846</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'metaFirstKey' must be private and have accessor methods.</td>
 <td>847</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'metaLastKey' must be private and have accessor methods.</td>
 <td>848</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'storesFirstKey' must be private and have accessor methods.</td>
 <td>849</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'storesLastKey' must be private and have accessor methods.</td>
 <td>850</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>910</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>912</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>987</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1113</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1118</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1167</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1171</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 118).</td>
 <td>1177</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
 <td>1187</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1205</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1360</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2040</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2082</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 231 lines (max allowed is 150).</td>
 <td>2103</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2106</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>2178</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'errorCount' must be private and have accessor methods.</td>
 <td>2810</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
 <td>3474</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 114).</td>
 <td>3479</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>3494</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 120).</td>
 <td>3502</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
 <td>3506</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -17202,13 +17195,13 @@
 <td>3558</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HBaseFsckRepair.java">org/apache/hadoop/hbase/util/HBaseFsckRepair.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -17216,13 +17209,13 @@
 <td>54</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HBaseHomePath.java">org/apache/hadoop/hbase/util/HBaseHomePath.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -17230,43 +17223,43 @@
 <td>24</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HFileArchiveTestingUtil.java">org/apache/hadoop/hbase/util/HFileArchiveTestingUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class HFileArchiveTestingUtil should be declared as final.</td>
 <td>41</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>133</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>135</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>188</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>189</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17274,39 +17267,39 @@
 <td>197</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HFileArchiveUtil.java">org/apache/hadoop/hbase/util/HFileArchiveUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>196</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>197</td></tr>
+<td>196</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>197</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>200</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HFileTestUtil.java">org/apache/hadoop/hbase/util/HFileTestUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -17314,19 +17307,19 @@
 <td>52</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.HashedBytes.java">org/apache/hadoop/hbase/util/HashedBytes.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>51</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17334,13 +17327,13 @@
 <td>52</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.JSONBean.java">org/apache/hadoop/hbase/util/JSONBean.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -17348,19 +17341,19 @@
 <td>255</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.JVM.java">org/apache/hadoop/hbase/util/JVM.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>181</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -17368,19 +17361,19 @@
 <td>305</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.JVMClusterUtil.java">org/apache/hadoop/hbase/util/JVMClusterUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>40</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17388,19 +17381,19 @@
 <td>305</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.JenkinsHash.java">org/apache/hadoop/hbase/util/JenkinsHash.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>104</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -17408,13 +17401,13 @@
 <td>104</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.JvmPauseMonitor.java">org/apache/hadoop/hbase/util/JvmPauseMonitor.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -17422,13 +17415,13 @@
 <td>116</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.KeyLocker.java">org/apache/hadoop/hbase/util/KeyLocker.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17436,13 +17429,13 @@
 <td>64</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.LoadTestDataGeneratorWithMOB.java">org/apache/hadoop/hbase/util/LoadTestDataGeneratorWithMOB.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17450,25 +17443,25 @@
 <td>60</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.LoadTestTool.java">org/apache/hadoop/hbase/util/LoadTestTool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 189 lines (max allowed is 150).</td>
 <td>574</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>647</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17476,13 +17469,13 @@
 <td>886</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.LogMonitoring.java">org/apache/hadoop/hbase/util/LogMonitoring.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17490,13 +17483,13 @@
 <td>68</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.MD5Hash.java">org/apache/hadoop/hbase/util/MD5Hash.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -17504,19 +17497,19 @@
 <td>28</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ModifyRegionUtils.java">org/apache/hadoop/hbase/util/ModifyRegionUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>96</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17524,25 +17517,25 @@
 <td>120</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.MultiThreadedAction.java">org/apache/hadoop/hbase/util/MultiThreadedAction.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 229).</td>
 <td>81</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 170 lines (max allowed is 150).</td>
 <td>314</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17550,229 +17543,229 @@
 <td>533</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.OrderedBytes.java">org/apache/hadoop/hbase/util/OrderedBytes.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>296</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>369</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>369</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>371</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>469</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>470</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>471</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>472</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>473</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>474</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>475</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>476</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>477</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
 <td>609</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>610</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>851</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>933</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>934</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>935</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>936</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>955</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>956</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>957</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>974</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>990</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>997</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>998</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1015</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>1016</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1105</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
 <td>Empty statement.</td>
 <td>1106</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1123</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1145</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1167</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>1202</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>1722</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EmptyStatement</td>
@@ -17780,57 +17773,57 @@
 <td>1723</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.PairOfSameType.java">org/apache/hadoop/hbase/util/PairOfSameType.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>71</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>72</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>73</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>93</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>94</td></tr>
+<td>93</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>94</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
 <td>95</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.PrettyPrinter.java">org/apache/hadoop/hbase/util/PrettyPrinter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -17838,13 +17831,13 @@
 <td>32</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ReflectionUtils.java">org/apache/hadoop/hbase/util/ReflectionUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -17852,13 +17845,13 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.RegionMover.java">org/apache/hadoop/hbase/util/RegionMover.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -17866,87 +17859,87 @@
 <td>84</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.RegionSplitCalculator.java">org/apache/hadoop/hbase/util/RegionSplitCalculator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
 <td>44</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>75</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>76</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>77</td></tr>
+<td>76</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>77</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>200</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.RegionSplitter.java">org/apache/hadoop/hbase/util/RegionSplitter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>134</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 194 lines (max allowed is 150).</td>
 <td>398</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>514</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>675</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>683</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>751</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17954,19 +17947,19 @@
 <td>752</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ServerCommandLine.java">org/apache/hadoop/hbase/util/ServerCommandLine.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>123</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
@@ -17974,13 +17967,13 @@
 <td>138</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ShutdownHookManager.java">org/apache/hadoop/hbase/util/ShutdownHookManager.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -17988,13 +17981,13 @@
 <td>65</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.SimpleByteRange.java">org/apache/hadoop/hbase/util/SimpleByteRange.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EqualsHashCode</td>
@@ -18002,71 +17995,71 @@
 <td>125</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.SimpleMutableByteRange.java">org/apache/hadoop/hbase/util/SimpleMutableByteRange.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>108</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>114</td></tr>
+<td>108</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>114</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>EqualsHashCode</td>
 <td>Definition of 'equals()' without corresponding definition of 'hashCode()'.</td>
 <td>207</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange.java">org/apache/hadoop/hbase/util/SimplePositionedMutableByteRange.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>162</td></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>168</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>194</td></tr>
+<td>168</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>194</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>200</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.StealJobQueue.java">org/apache/hadoop/hbase/util/StealJobQueue.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18074,19 +18067,19 @@
 <td>122</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestBloomFilterChunk.java">org/apache/hadoop/hbase/util/TestBloomFilterChunk.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>121</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18094,13 +18087,13 @@
 <td>163</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestCompressionTest.java">org/apache/hadoop/hbase/util/TestCompressionTest.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -18108,39 +18101,39 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestFSUtils.java">org/apache/hadoop/hbase/util/TestFSUtils.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>misc</td>
-<td>ArrayTypeStyle</td>
-<td>Array brackets at illegal position.</td>
-<td>139</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>172</td></tr>
+<td>139</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
+<td>172</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>misc</td>
+<td>ArrayTypeStyle</td>
+<td>Array brackets at illegal position.</td>
 <td>205</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestIdLock.java">org/apache/hadoop/hbase/util/TestIdLock.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18148,13 +18141,13 @@
 <td>101</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestIdReadWriteLockWithObjectPool.java">org/apache/hadoop/hbase/util/TestIdReadWriteLockWithObjectPool.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18162,13 +18155,13 @@
 <td>126</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestRegionMoverWithRSGroupEnable.java">org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18176,13 +18169,13 @@
 <td>96</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.TestSortedList.java">org/apache/hadoop/hbase/util/TestSortedList.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>imports</td>
 <td>AvoidStarImport</td>
@@ -18190,19 +18183,19 @@
 <td>20</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Threads.java">org/apache/hadoop/hbase/util/Threads.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
 <td>36</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18210,39 +18203,39 @@
 <td>94</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Triple.java">org/apache/hadoop/hbase/util/Triple.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>64</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>66</td></tr>
+<td>64</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
+<td>66</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
 <td>68</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.VersionInfo.java">org/apache/hadoop/hbase/util/VersionInfo.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -18250,13 +18243,13 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.Writables.java">org/apache/hadoop/hbase/util/Writables.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -18264,25 +18257,25 @@
 <td>34</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.ZKDataMigrator.java">org/apache/hadoop/hbase/util/ZKDataMigrator.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
 <td>Class ZKDataMigrator should be declared as final.</td>
 <td>42</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>62</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18290,13 +18283,13 @@
 <td>104</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.hbck.HbckTestingUtil.java">org/apache/hadoop/hbase/util/hbck/HbckTestingUtil.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
@@ -18304,13 +18297,13 @@
 <td>35</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.BoundedGroupingStrategy.java">org/apache/hadoop/hbase/wal/BoundedGroupingStrategy.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18318,13 +18311,13 @@
 <td>58</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.DisabledWALProvider.java">org/apache/hadoop/hbase/wal/DisabledWALProvider.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18332,19 +18325,19 @@
 <td>223</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.IOTestProvider.java">org/apache/hadoop/hbase/wal/IOTestProvider.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
 <td>241</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>coding</td>
 <td>InnerAssignment</td>
@@ -18352,19 +18345,19 @@
 <td>243</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.TestWALFactory.java">org/apache/hadoop/hbase/wal/TestWALFactory.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>448</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18372,13 +18365,13 @@
 <td>506</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.TestWALRootDir.java">org/apache/hadoop/hbase/wal/TestWALRootDir.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
@@ -18386,83 +18379,83 @@
 <td>132</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.TestWALSplit.java">org/apache/hadoop/hbase/wal/TestWALSplit.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'while' construct must use '{}'s.</td>
-<td>234</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'while' construct must use '{}'s.</td>
-<td>849</td></tr>
+<td>234</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
+<td>'while' construct must use '{}'s.</td>
+<td>849</td></tr>
+<tr class="b">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
 <td>1068</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.WALPerformanceEvaluation.java">org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java</h3>
 <table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 176 lines (max allowed is 150).</td>
 <td>178</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>319</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
 <td>322</td></tr>
-<tr class="b">
-<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>343</td></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>395</td></tr>
+<td>343</td></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
+<td>'if' construct must use '{}'s.</td>
+<td>395</td></tr>
+<tr class="a">
+<td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
+<td>blocks</td>
+<td>NeedBraces</td>
 <td>'for' construct must use '{}'s.</td>
 <td>525</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.wal.WALSplitter.java">org/apache/hadoop/hbase/wal/WALSplitter.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
@@ -18470,13 +18463,13 @@
 <td>280</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.zookeeper.ZKMetadata.java">org/apache/hadoop/hbase/zookeeper/ZKMetadata.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>FinalClass</td>
@@ -18484,115 +18477,115 @@
 <td>27</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.zookeeper.ZNodePaths.java">org/apache/hadoop/hbase/zookeeper/ZNodePaths.java</h3>
 <table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
 <th>Severity</th>
 <th>Category</th>
 <th>Rule</th>
 <th>Message</th>
 <th>Line</th></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'baseZNode' must be private and have accessor methods.</td>
 <td>43</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'rsZNode' must be private and have accessor methods.</td>
 <td>52</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'drainingZNode' must be private and have accessor methods.</td>
 <td>54</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'masterAddressZNode' must be private and have accessor methods.</td>
 <td>56</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'backupMasterAddressesZNode' must be private and have accessor methods.</td>
 <td>58</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'clusterStateZNode' must be private and have accessor methods.</td>
 <td>60</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'tableZNode' must be private and have accessor methods.</td>
 <td>66</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'clusterIdZNode' must be private and have accessor methods.</td>
 <td>68</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'splitLogZNode' must be private and have accessor methods.</td>
 <td>70</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'balancerZNode' must be private and have accessor methods.</td>
 <td>77</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'regionNormalizerZNode' must be private and have accessor methods.</td>
 <td>84</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'switchZNode' must be private and have accessor methods.</td>
 <td>91</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'masterMaintZNode' must be private and have accessor methods.</td>
 <td>93</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'replicationZNode' must be private and have accessor methods.</td>
 <td>96</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'peersZNode' must be private and have accessor methods.</td>
 <td>98</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'queuesZNode' must be private and have accessor methods.</td>
 <td>100</td></tr>
-<tr class="b">
+<tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
 <td>Variable 'hfileRefsZNode' must be private and have accessor methods.</td>
 <td>102</td></tr>
-<tr class="a">
+<tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
 <td>design</td>
 <td>VisibilityModifier</td>
@@ -18606,7 +18599,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/coc.html b/coc.html
index a6196d0..0ce6a84 100644
--- a/coc.html
+++ b/coc.html
@@ -248,7 +248,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependencies.html b/dependencies.html
index 1e8c7fe..b498262 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -313,7 +313,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-convergence.html b/dependency-convergence.html
index aee120f..8f40f95 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -903,7 +903,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-info.html b/dependency-info.html
index 49510ad..70553a2 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -195,7 +195,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-management.html b/dependency-management.html
index e6b8d5b..456409a 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -1198,7 +1198,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 3c8248a..9d1558a 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -75464,6 +75464,10 @@
 <dd>
 <div class="block">Check if the OS is linux.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#isLoaded--">isLoaded()</a></span> - Static method in class org.apache.hadoop.hbase.io.compress.xerial.<a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html" title="class in org.apache.hadoop.hbase.io.compress.xerial">SnappyCodec</a></dt>
+<dd>
+<div class="block">Return true if the native shared libraries were loaded; false otherwise.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/HRegion.html#isLoadingCfsOnDemandDefault">isLoadingCfsOnDemandDefault</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/HRegion.html" title="class in org.apache.hadoop.hbase.regionserver">HRegion</a></dt>
 <dd>
 <div class="block">The default setting for whether to enable on-demand CF loading for scan requests to this
@@ -80716,6 +80720,8 @@
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Get deployed regions according to the region servers.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#loaded">loaded</a></span> - Static variable in class org.apache.hadoop.hbase.io.compress.xerial.<a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html" title="class in org.apache.hadoop.hbase.io.compress.xerial">SnappyCodec</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/FastPathRpcHandler.html#loadedCallRunner">loadedCallRunner</a></span> - Variable in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/FastPathRpcHandler.html" title="class in org.apache.hadoop.hbase.ipc">FastPathRpcHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/RegionHDFSBlockLocationFinder.html#loader">loader</a></span> - Variable in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/RegionHDFSBlockLocationFinder.html" title="class in org.apache.hadoop.hbase.master.balancer">RegionHDFSBlockLocationFinder</a></dt>
@@ -80724,6 +80730,8 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#loadError">loadError</a></span> - Static variable in class org.apache.hadoop.hbase.io.compress.xerial.<a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html" title="class in org.apache.hadoop.hbase.io.compress.xerial">SnappyCodec</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/StoreFileReader.html#loadFileInfo--">loadFileInfo()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.html#loadFiles-java.util.List-">loadFiles(List&lt;HStoreFile&gt;)</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.html" title="class in org.apache.hadoop.hbase.regionserver">DefaultStoreFileManager</a></dt>
@@ -81636,6 +81644,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.io.compress.<a href="org/apache/hadoop/hbase/io/compress/ReusableStreamGzipCodec.html" title="class in org.apache.hadoop.hbase.io.compress">ReusableStreamGzipCodec</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.io.compress.xerial.<a href="org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html" title="class in org.apache.hadoop.hbase.io.compress.xerial">SnappyCodec</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/crypto/aes/AES.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.io.crypto.aes.<a href="org/apache/hadoop/hbase/io/crypto/aes/AES.html" title="class in org.apache.hadoop.hbase.io.crypto.aes">AES</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.io.crypto.aes.<a href="org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAES.html" title="class in org.apache.hadoop.hbase.io.crypto.aes">CommonsCryptoAES</a></dt>
@@ -84545,8 +84555,7 @@
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#map">map</a></span> - Variable in class org.apache.hadoop.hbase.io.hfile.<a href="org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a></dt>
 <dd>
 <div class="block">Defined the cache map as <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentHashMap</code></a> here, because in
- <a href="org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#computeIfPresent
- (key, func).</div>
+ <a href="org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#k (key, func).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapred/GroupingTableMap.html#map-org.apache.hadoop.hbase.io.ImmutableBytesWritable-org.apache.hadoop.hbase.client.Result-org.apache.hadoop.mapred.OutputCollector-org.apache.hadoop.mapred.Reporter-">map(ImmutableBytesWritable, Result, OutputCollector&lt;ImmutableBytesWritable, Result&gt;, Reporter)</a></span> - Method in class org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/GroupingTableMap.html" title="class in org.apache.hadoop.hbase.mapred">GroupingTableMap</a></dt>
 <dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.File.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
index da9fd8b..08e32ab 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
@@ -117,7 +117,7 @@
 </dl>
 <hr>
 <br>
-<pre>private abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.673">HFileArchiver.File</a>
+<pre>private abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.687">HFileArchiver.File</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Wrapper to handle file operations uniformly</div>
 </li>
@@ -252,7 +252,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>fs</h4>
-<pre>protected final&nbsp;org.apache.hadoop.fs.FileSystem <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.674">fs</a></pre>
+<pre>protected final&nbsp;org.apache.hadoop.fs.FileSystem <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.688">fs</a></pre>
 </li>
 </ul>
 </li>
@@ -269,7 +269,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>File</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.676">File</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.690">File</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
 </li>
 </ul>
 </li>
@@ -286,7 +286,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>abstract&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.684">delete</a>()
+<pre>abstract&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.698">delete</a>()
               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Delete the file</div>
 <dl>
@@ -301,7 +301,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>isFile</h4>
-<pre>abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.691">isFile</a>()
+<pre>abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.705">isFile</a>()
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Check to see if this is a file or a directory</div>
 <dl>
@@ -318,7 +318,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getChildren</h4>
-<pre>abstract&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.697">getChildren</a>()
+<pre>abstract&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.711">getChildren</a>()
                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -335,7 +335,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>abstract&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.702">close</a>()
+<pre>abstract&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.716">close</a>()
              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">close any outside readers of the file</div>
 <dl>
@@ -350,7 +350,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>abstract&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.705">getName</a>()</pre>
+<pre>abstract&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.719">getName</a>()</pre>
 <div class="block">Returns the name of the file (not the full fs path, just the individual file name)</div>
 </li>
 </ul>
@@ -360,7 +360,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getPath</h4>
-<pre>abstract&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.708">getPath</a>()</pre>
+<pre>abstract&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.722">getPath</a>()</pre>
 <div class="block">Returns the path to this file</div>
 </li>
 </ul>
@@ -370,7 +370,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>moveAndClose</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.714">moveAndClose</a>(org.apache.hadoop.fs.Path&nbsp;dest)
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.728">moveAndClose</a>(org.apache.hadoop.fs.Path&nbsp;dest)
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Move the file to the given destination</div>
 <dl>
@@ -387,7 +387,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getFileSystem</h4>
-<pre>public&nbsp;org.apache.hadoop.fs.FileSystem&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.721">getFileSystem</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.fs.FileSystem&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.735">getFileSystem</a>()</pre>
 <div class="block">Returns the <code>FileSystem</code> on which this file resides</div>
 </li>
 </ul>
@@ -397,7 +397,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.726">toString</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html#line.740">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
index 8a14942..738c2eb 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
@@ -119,7 +119,7 @@
 </dl>
 <hr>
 <br>
-<pre>private abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.634">HFileArchiver.FileConverter</a>&lt;T&gt;
+<pre>private abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.648">HFileArchiver.FileConverter</a>&lt;T&gt;
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;T,<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;</pre>
 <div class="block">Adapt a type to match the <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup"><code>HFileArchiver.File</code></a> interface, which is used internally for handling
@@ -206,7 +206,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>fs</h4>
-<pre>protected final&nbsp;org.apache.hadoop.fs.FileSystem <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html#line.635">fs</a></pre>
+<pre>protected final&nbsp;org.apache.hadoop.fs.FileSystem <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html#line.649">fs</a></pre>
 </li>
 </ul>
 </li>
@@ -223,7 +223,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FileConverter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html#line.637">FileConverter</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html#line.651">FileConverter</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
index 1218beda86..860af8f 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
@@ -122,7 +122,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.645">HFileArchiver.FileStatusConverter</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.659">HFileArchiver.FileStatusConverter</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.FileConverter</a>&lt;org.apache.hadoop.fs.FileStatus&gt;</pre>
 <div class="block">Convert a FileStatus to something we can manage in the archiving</div>
 </li>
@@ -214,7 +214,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FileStatusConverter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html#line.646">FileStatusConverter</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html#line.660">FileStatusConverter</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
 </li>
 </ul>
 </li>
@@ -231,7 +231,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>apply</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html#line.651">apply</a>(org.apache.hadoop.fs.FileStatus&nbsp;input)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html#line.665">apply</a>(org.apache.hadoop.fs.FileStatus&nbsp;input)</pre>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
index 3181f26..97ae02e 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
@@ -118,7 +118,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.734">HFileArchiver.FileablePath</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.748">HFileArchiver.FileablePath</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a></pre>
 <div class="block">A <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup"><code>HFileArchiver.File</code></a> that wraps a simple <code>Path</code> on a <code>FileSystem</code>.</div>
 </li>
@@ -256,7 +256,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>file</h4>
-<pre>private final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.735">file</a></pre>
+<pre>private final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.749">file</a></pre>
 </li>
 </ul>
 <a name="getAsFile">
@@ -265,7 +265,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getAsFile</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.FileStatusConverter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.736">getAsFile</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.FileStatusConverter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.750">getAsFile</a></pre>
 </li>
 </ul>
 </li>
@@ -282,7 +282,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FileablePath</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.738">FileablePath</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.752">FileablePath</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
                     org.apache.hadoop.fs.Path&nbsp;file)</pre>
 </li>
 </ul>
@@ -300,7 +300,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.745">delete</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.759">delete</a>()
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#delete--">HFileArchiver.File</a></code></span></div>
 <div class="block">Delete the file</div>
@@ -318,7 +318,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.750">getName</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.764">getName</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#getName--">HFileArchiver.File</a></code></span></div>
 <div class="block">Returns the name of the file (not the full fs path, just the individual file name)</div>
 <dl>
@@ -333,7 +333,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getChildren</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.755">getChildren</a>()
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.769">getChildren</a>()
                                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -352,7 +352,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>isFile</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.763">isFile</a>()
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.777">isFile</a>()
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#isFile--">HFileArchiver.File</a></code></span></div>
 <div class="block">Check to see if this is a file or a directory</div>
@@ -372,7 +372,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.768">close</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.782">close</a>()
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#close--">HFileArchiver.File</a></code></span></div>
 <div class="block">close any outside readers of the file</div>
@@ -390,7 +390,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getPath</h4>
-<pre>org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.773">getPath</a>()</pre>
+<pre>org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html#line.787">getPath</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#getPath--">HFileArchiver.File</a></code></span></div>
 <div class="block">Returns the path to this file</div>
 <dl>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
index d3bc573..88539c6 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
@@ -118,7 +118,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.781">HFileArchiver.FileableStoreFile</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.795">HFileArchiver.FileableStoreFile</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a></pre>
 <div class="block"><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup"><code>HFileArchiver.File</code></a> adapter for a <a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver"><code>HStoreFile</code></a> living on a <code>FileSystem</code> .</div>
 </li>
@@ -252,7 +252,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>file</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.782">file</a></pre>
+<pre><a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.796">file</a></pre>
 </li>
 </ul>
 </li>
@@ -269,7 +269,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FileableStoreFile</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.784">FileableStoreFile</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.798">FileableStoreFile</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
                          <a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;store)</pre>
 </li>
 </ul>
@@ -287,7 +287,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.790">delete</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.804">delete</a>()
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#delete--">HFileArchiver.File</a></code></span></div>
 <div class="block">Delete the file</div>
@@ -305,7 +305,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.795">getName</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.809">getName</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#getName--">HFileArchiver.File</a></code></span></div>
 <div class="block">Returns the name of the file (not the full fs path, just the individual file name)</div>
 <dl>
@@ -320,7 +320,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>isFile</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.800">isFile</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.814">isFile</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#isFile--">HFileArchiver.File</a></code></span></div>
 <div class="block">Check to see if this is a file or a directory</div>
 <dl>
@@ -337,7 +337,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getChildren</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.805">getChildren</a>()
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.819">getChildren</a>()
                                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -356,7 +356,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.811">close</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.825">close</a>()
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#close--">HFileArchiver.File</a></code></span></div>
 <div class="block">close any outside readers of the file</div>
@@ -374,7 +374,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getPath</h4>
-<pre>org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.816">getPath</a>()</pre>
+<pre>org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html#line.830">getPath</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html#getPath--">HFileArchiver.File</a></code></span></div>
 <div class="block">Returns the path to this file</div>
 <dl>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
index b93bf7b..0f574d4 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
@@ -122,7 +122,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.659">HFileArchiver.StoreToFile</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.673">HFileArchiver.StoreToFile</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.FileConverter</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;</pre>
 <div class="block">Convert the <a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver"><code>HStoreFile</code></a> into something we can manage in the archive methods</div>
 </li>
@@ -214,7 +214,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StoreToFile</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html#line.660">StoreToFile</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html#line.674">StoreToFile</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs)</pre>
 </li>
 </ul>
 </li>
@@ -231,7 +231,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>apply</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html#line.665">apply</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;input)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/backup/HFileArchiver.File.html" title="class in org.apache.hadoop.hbase.backup">HFileArchiver.File</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html#line.679">apply</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;input)</pre>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.html b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.html
index bc8e985..32144fd 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/HFileArchiver.html
@@ -806,7 +806,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteRegionWithoutArchiving</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.593">deleteRegionWithoutArchiving</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.607">deleteRegionWithoutArchiving</a>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
                                                     org.apache.hadoop.fs.Path&nbsp;regionDir)
                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Without regard for backup, delete a region. Should be used with caution.</div>
@@ -827,7 +827,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>deleteStoreFilesWithoutArchiving</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.612">deleteStoreFilesWithoutArchiving</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;compactedFiles)
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html#line.626">deleteStoreFilesWithoutArchiving</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;compactedFiles)
                                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Just do a simple delete of the given store files
  <p>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 9849e3f..300d313 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -166,9 +166,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 473f013..813aef8 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -470,24 +470,24 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.FilterByOperator.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.FilterByOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.Type.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.FilterByOperator.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.FilterByOperator</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ServerType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
index 7772929..1578c9c 100644
--- a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
@@ -176,8 +176,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.MutationType.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">RegionObserver.MutationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.MetaTableOps.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">MetaTableMetrics.MetaTableOps</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.MutationType.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">RegionObserver.MutationType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
index d591707..6982d89 100644
--- a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
@@ -105,8 +105,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 66baf60..a426fce 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -190,11 +190,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/hbtop/field/package-tree.html b/devapidocs/org/apache/hadoop/hbase/hbtop/field/package-tree.html
index 3927ac3..2c78ecd 100644
--- a/devapidocs/org/apache/hadoop/hbase/hbtop/field/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/hbtop/field/package-tree.html
@@ -92,8 +92,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.hbtop.field.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/field/Field.html" title="enum in org.apache.hadoop.hbase.hbtop.field"><span class="typeNameLink">Field</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.hbtop.field.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/field/FieldValueType.html" title="enum in org.apache.hadoop.hbase.hbtop.field"><span class="typeNameLink">FieldValueType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.hbtop.field.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/field/Field.html" title="enum in org.apache.hadoop.hbase.hbtop.field"><span class="typeNameLink">Field</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/http/package-tree.html b/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
index a589de3..f057548 100644
--- a/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
@@ -141,9 +141,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/ProfileServlet.Output.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Output</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/HttpConfig.Policy.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">HttpConfig.Policy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/ProfileServlet.Event.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Event</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/ProfileServlet.Output.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Output</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html b/devapidocs/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
index 2fa2f37..6f5c395 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -114,7 +114,7 @@
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.42">SnappyCodec</a>
+public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.44">SnappyCodec</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements org.apache.hadoop.conf.Configurable, org.apache.hadoop.io.compress.CompressionCodec</pre>
 <div class="block">Hadoop Snappy codec implemented with Xerial Snappy.
@@ -162,6 +162,18 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#conf">conf</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#loaded">loaded</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#loadError">loadError</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#SNAPPY_BUFFER_SIZE_KEY">SNAPPY_BUFFER_SIZE_KEY</a></span></code>&nbsp;</td>
 </tr>
@@ -244,6 +256,12 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#getDefaultExtension--">getDefaultExtension</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#isLoaded--">isLoaded</a></span>()</code>
+<div class="block">Return true if the native shared libraries were loaded; false otherwise.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#setConf-org.apache.hadoop.conf.Configuration-">setConf</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
 </tr>
@@ -275,29 +293,56 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>SNAPPY_BUFFER_SIZE_KEY</h4>
-<pre>public static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/compress/xerial/SnappyCodec.html#line.44">SNAPPY_BUFFER_SIZE_KEY</a></pre>
+<pre>public static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/compress/xerial/SnappyCodec.html#line.46">SNAPPY_BUFFER_SIZE_KEY</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../../constant-values.html#org.apache.hadoop.hbase.io.compress.xerial.SnappyCodec.SNAPPY_BUFFER_SIZE_KEY">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.48">LOG</a></pre>
+</li>
+</ul>
 <a name="conf">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.46">conf</a></pre>
+<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.49">conf</a></pre>
 </li>
 </ul>
 <a name="bufferSize">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>bufferSize</h4>
-<pre>private&nbsp;int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.47">bufferSize</a></pre>
+<pre>private&nbsp;int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.50">bufferSize</a></pre>
+</li>
+</ul>
+<a name="loaded">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>loaded</h4>
+<pre>private static&nbsp;boolean <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.51">loaded</a></pre>
+</li>
+</ul>
+<a name="loadError">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>loadError</h4>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.52">loadError</a></pre>
 </li>
 </ul>
 </li>
@@ -314,7 +359,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SnappyCodec</h4>
-<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.49">SnappyCodec</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.69">SnappyCodec</a>()</pre>
 </li>
 </ul>
 </li>
@@ -325,13 +370,23 @@
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="isLoaded--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLoaded</h4>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.65">isLoaded</a>()</pre>
+<div class="block">Return true if the native shared libraries were loaded; false otherwise.</div>
+</li>
+</ul>
 <a name="getConf--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConf</h4>
-<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.55">getConf</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.78">getConf</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getConf</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.conf.Configurable</code></dd>
@@ -344,7 +399,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>setConf</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.60">setConf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.83">setConf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>setConf</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.conf.Configurable</code></dd>
@@ -357,7 +412,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createCompressor</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.Compressor&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.66">createCompressor</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.io.compress.Compressor&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.89">createCompressor</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>createCompressor</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.io.compress.CompressionCodec</code></dd>
@@ -370,7 +425,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createDecompressor</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.Decompressor&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.71">createDecompressor</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.io.compress.Decompressor&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.94">createDecompressor</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>createDecompressor</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.io.compress.CompressionCodec</code></dd>
@@ -383,7 +438,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createInputStream</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionInputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.76">createInputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;in)
+<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionInputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.99">createInputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;in)
                                                                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -399,7 +454,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createInputStream</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionInputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.81">createInputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;in,
+<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionInputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.104">createInputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;in,
                                                                               org.apache.hadoop.io.compress.Decompressor&nbsp;d)
                                                                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -416,7 +471,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createOutputStream</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionOutputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.87">createOutputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;out)
+<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionOutputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.110">createOutputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;out)
                                                                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -432,7 +487,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>createOutputStream</h4>
-<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionOutputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.92">createOutputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;out,
+<pre>public&nbsp;org.apache.hadoop.io.compress.CompressionOutputStream&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.115">createOutputStream</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;out,
                                                                                 org.apache.hadoop.io.compress.Compressor&nbsp;c)
                                                                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -449,7 +504,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompressorType</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.hadoop.io.compress.Compressor&gt;&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.99">getCompressorType</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.hadoop.io.compress.Compressor&gt;&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.122">getCompressorType</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getCompressorType</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.io.compress.CompressionCodec</code></dd>
@@ -462,7 +517,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getDecompressorType</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.hadoop.io.compress.Decompressor&gt;&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.104">getDecompressorType</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.hadoop.io.compress.Decompressor&gt;&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.127">getDecompressorType</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getDecompressorType</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.io.compress.CompressionCodec</code></dd>
@@ -475,7 +530,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getDefaultExtension</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.109">getDefaultExtension</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.132">getDefaultExtension</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getDefaultExtension</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.io.compress.CompressionCodec</code></dd>
@@ -488,7 +543,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getBufferSize</h4>
-<pre>static&nbsp;int&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.115">getBufferSize</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>static&nbsp;int&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html#line.138">getBufferSize</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
index c9ab961..692530c 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
@@ -117,7 +117,7 @@
 </dl>
 <hr>
 <br>
-<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.788">LruBlockCache.BlockBucket</a>
+<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.802">LruBlockCache.BlockBucket</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.BlockBucket</a>&gt;</pre>
 <div class="block">Used to group blocks into priority buckets. There will be a BlockBucket for each priority
@@ -252,7 +252,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>name</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.BlockBucket.html#line.790">name</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.BlockBucket.html#line.804">name</a></pre>
 </li>
 </ul>
 <a name="queue">
@@ -261,7 +261,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>queue</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlockQueue.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlockQueue</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.791">queue</a></pre>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlockQueue.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlockQueue</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.805">queue</a></pre>
 </li>
 </ul>
 <a name="totalSize">
@@ -270,7 +270,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>totalSize</h4>
-<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.792">totalSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.806">totalSize</a></pre>
 </li>
 </ul>
 <a name="bucketSize">
@@ -279,7 +279,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bucketSize</h4>
-<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.793">bucketSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.807">bucketSize</a></pre>
 </li>
 </ul>
 </li>
@@ -296,7 +296,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BlockBucket</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.795">BlockBucket</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.809">BlockBucket</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                    long&nbsp;bytesToFree,
                    long&nbsp;blockSize,
                    long&nbsp;bucketSize)</pre>
@@ -316,7 +316,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>add</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.802">add</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.816">add</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block)</pre>
 </li>
 </ul>
 <a name="free-long-">
@@ -325,7 +325,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>free</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.807">free</a>(long&nbsp;toFree)</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.821">free</a>(long&nbsp;toFree)</pre>
 </li>
 </ul>
 <a name="overflow--">
@@ -334,7 +334,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>overflow</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.825">overflow</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.839">overflow</a>()</pre>
 </li>
 </ul>
 <a name="totalSize--">
@@ -343,7 +343,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>totalSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.829">totalSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.843">totalSize</a>()</pre>
 </li>
 </ul>
 <a name="compareTo-org.apache.hadoop.hbase.io.hfile.LruBlockCache.BlockBucket-">
@@ -352,7 +352,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.834">compareTo</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.BlockBucket</a>&nbsp;that)</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.848">compareTo</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.BlockBucket</a>&nbsp;that)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true#compareTo-T-" title="class or interface in java.lang">compareTo</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.BlockBucket</a>&gt;</code></dd>
@@ -365,7 +365,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.839">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;that)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.853">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;that)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -378,7 +378,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>hashCode</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.847">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.861">hashCode</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -391,7 +391,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.852">toString</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html#line.866">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
index 765bdc1..2a44e44 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
@@ -122,7 +122,7 @@
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.924">LruBlockCache.EvictionThread</a>
+<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.938">LruBlockCache.EvictionThread</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a></pre>
 </li>
 </ul>
@@ -265,7 +265,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>cache</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ref/WeakReference.html?is-external=true" title="class or interface in java.lang.ref">WeakReference</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.926">cache</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ref/WeakReference.html?is-external=true" title="class or interface in java.lang.ref">WeakReference</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.940">cache</a></pre>
 </li>
 </ul>
 <a name="go">
@@ -274,7 +274,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>go</h4>
-<pre>private volatile&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.927">go</a></pre>
+<pre>private volatile&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.941">go</a></pre>
 </li>
 </ul>
 <a name="enteringRun">
@@ -283,7 +283,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>enteringRun</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.929">enteringRun</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.943">enteringRun</a></pre>
 </li>
 </ul>
 </li>
@@ -300,7 +300,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>EvictionThread</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.931">EvictionThread</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&nbsp;cache)</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.945">EvictionThread</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&nbsp;cache)</pre>
 </li>
 </ul>
 </li>
@@ -317,7 +317,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.938">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.952">run</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -332,7 +332,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evict</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.960">evict</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.974">evict</a>()</pre>
 </li>
 </ul>
 <a name="shutdown--">
@@ -341,7 +341,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.966">shutdown</a>()</pre>
+<pre>void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.980">shutdown</a>()</pre>
 </li>
 </ul>
 <a name="isGo--">
@@ -350,7 +350,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>isGo</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.971">isGo</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.985">isGo</a>()</pre>
 </li>
 </ul>
 <a name="isEnteringRun--">
@@ -359,7 +359,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isEnteringRun</h4>
-<pre>boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.978">isEnteringRun</a>()</pre>
+<pre>boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html#line.992">isEnteringRun</a>()</pre>
 <div class="block">Used for the test.</div>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
index a11c753..6c91904 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
@@ -122,7 +122,7 @@
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.986">LruBlockCache.StatisticsThread</a>
+<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1000">LruBlockCache.StatisticsThread</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a></pre>
 </li>
 </ul>
@@ -239,7 +239,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>lru</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.988">lru</a></pre>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.1002">lru</a></pre>
 </li>
 </ul>
 </li>
@@ -256,7 +256,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StatisticsThread</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.990">StatisticsThread</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&nbsp;lru)</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.1004">StatisticsThread</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache</a>&nbsp;lru)</pre>
 </li>
 </ul>
 </li>
@@ -273,7 +273,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.997">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html#line.1011">run</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
index bb83459..89693d4 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
@@ -118,7 +118,7 @@
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.88">LruBlockCache</a>
+public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.89">LruBlockCache</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/FirstLevelBlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">FirstLevelBlockCache</a></pre>
 <div class="block">A block cache implementation that is memory-aware using <a href="../../../../../../org/apache/hadoop/hbase/io/HeapSize.html" title="interface in org.apache.hadoop.hbase.io"><code>HeapSize</code></a>, memory-bound using an
@@ -387,8 +387,7 @@
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#map">map</a></span></code>
 <div class="block">Defined the cache map as <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentHashMap</code></a> here, because in
- <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#computeIfPresent
- (key, func).</div>
+ <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#k (key, func).</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -823,7 +822,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.90">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.91">LOG</a></pre>
 </li>
 </ul>
 <a name="LRU_MIN_FACTOR_CONFIG_NAME">
@@ -832,7 +831,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_MIN_FACTOR_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.96">LRU_MIN_FACTOR_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.97">LRU_MIN_FACTOR_CONFIG_NAME</a></pre>
 <div class="block">Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep
  evicting during an eviction run till the cache size is down to 80% of the total.</div>
 <dl>
@@ -847,7 +846,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_ACCEPTABLE_FACTOR_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.101">LRU_ACCEPTABLE_FACTOR_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.102">LRU_ACCEPTABLE_FACTOR_CONFIG_NAME</a></pre>
 <div class="block">Acceptable size of cache (no evictions if size < acceptable)</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -861,7 +860,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME</h4>
-<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.107">LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME</a></pre>
+<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.108">LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME</a></pre>
 <div class="block">Hard capacity limit of cache, will reject any put if size > this * acceptable</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -875,7 +874,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_SINGLE_PERCENTAGE_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.109">LRU_SINGLE_PERCENTAGE_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.110">LRU_SINGLE_PERCENTAGE_CONFIG_NAME</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.LRU_SINGLE_PERCENTAGE_CONFIG_NAME">Constant Field Values</a></dd>
@@ -888,7 +887,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_MULTI_PERCENTAGE_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.111">LRU_MULTI_PERCENTAGE_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.112">LRU_MULTI_PERCENTAGE_CONFIG_NAME</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.LRU_MULTI_PERCENTAGE_CONFIG_NAME">Constant Field Values</a></dd>
@@ -901,7 +900,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_MEMORY_PERCENTAGE_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.113">LRU_MEMORY_PERCENTAGE_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.114">LRU_MEMORY_PERCENTAGE_CONFIG_NAME</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.LRU_MEMORY_PERCENTAGE_CONFIG_NAME">Constant Field Values</a></dd>
@@ -914,7 +913,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.121">LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.122">LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME</a></pre>
 <div class="block">Configuration key to force data-block always (except in-memory are too much) cached in memory
  for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode
  is a cluster-wide configuration</div>
@@ -930,7 +929,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_LOAD_FACTOR</h4>
-<pre>static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.127">DEFAULT_LOAD_FACTOR</a></pre>
+<pre>static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.128">DEFAULT_LOAD_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_LOAD_FACTOR">Constant Field Values</a></dd>
@@ -943,7 +942,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_CONCURRENCY_LEVEL</h4>
-<pre>static final&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.128">DEFAULT_CONCURRENCY_LEVEL</a></pre>
+<pre>static final&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.129">DEFAULT_CONCURRENCY_LEVEL</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_CONCURRENCY_LEVEL">Constant Field Values</a></dd>
@@ -956,7 +955,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_MIN_FACTOR</h4>
-<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.131">DEFAULT_MIN_FACTOR</a></pre>
+<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.132">DEFAULT_MIN_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_MIN_FACTOR">Constant Field Values</a></dd>
@@ -969,7 +968,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_ACCEPTABLE_FACTOR</h4>
-<pre>static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.132">DEFAULT_ACCEPTABLE_FACTOR</a></pre>
+<pre>static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.133">DEFAULT_ACCEPTABLE_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_ACCEPTABLE_FACTOR">Constant Field Values</a></dd>
@@ -982,7 +981,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_SINGLE_FACTOR</h4>
-<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.135">DEFAULT_SINGLE_FACTOR</a></pre>
+<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.136">DEFAULT_SINGLE_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_SINGLE_FACTOR">Constant Field Values</a></dd>
@@ -995,7 +994,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_MULTI_FACTOR</h4>
-<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.136">DEFAULT_MULTI_FACTOR</a></pre>
+<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.137">DEFAULT_MULTI_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_MULTI_FACTOR">Constant Field Values</a></dd>
@@ -1008,7 +1007,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_MEMORY_FACTOR</h4>
-<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.137">DEFAULT_MEMORY_FACTOR</a></pre>
+<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.138">DEFAULT_MEMORY_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_MEMORY_FACTOR">Constant Field Values</a></dd>
@@ -1021,7 +1020,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_HARD_CAPACITY_LIMIT_FACTOR</h4>
-<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.139">DEFAULT_HARD_CAPACITY_LIMIT_FACTOR</a></pre>
+<pre>private static final&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.140">DEFAULT_HARD_CAPACITY_LIMIT_FACTOR</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_HARD_CAPACITY_LIMIT_FACTOR">Constant Field Values</a></dd>
@@ -1034,7 +1033,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_IN_MEMORY_FORCE_MODE</h4>
-<pre>private static final&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.141">DEFAULT_IN_MEMORY_FORCE_MODE</a></pre>
+<pre>private static final&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.142">DEFAULT_IN_MEMORY_FORCE_MODE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_IN_MEMORY_FORCE_MODE">Constant Field Values</a></dd>
@@ -1047,7 +1046,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>STAT_THREAD_PERIOD</h4>
-<pre>private static final&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.144">STAT_THREAD_PERIOD</a></pre>
+<pre>private static final&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.145">STAT_THREAD_PERIOD</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.STAT_THREAD_PERIOD">Constant Field Values</a></dd>
@@ -1060,7 +1059,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LRU_MAX_BLOCK_SIZE</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.145">LRU_MAX_BLOCK_SIZE</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/LruBlockCache.html#line.146">LRU_MAX_BLOCK_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.LRU_MAX_BLOCK_SIZE">Constant Field Values</a></dd>
@@ -1073,7 +1072,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_MAX_BLOCK_SIZE</h4>
-<pre>private static final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.146">DEFAULT_MAX_BLOCK_SIZE</a></pre>
+<pre>private static final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.147">DEFAULT_MAX_BLOCK_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.LruBlockCache.DEFAULT_MAX_BLOCK_SIZE">Constant Field Values</a></dd>
@@ -1086,12 +1085,14 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.155">map</a></pre>
+<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.158">map</a></pre>
 <div class="block">Defined the cache map as <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentHashMap</code></a> here, because in
- <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#computeIfPresent
- (key, func). Besides, the func method must execute exactly once only when the key is present
- and under the lock context, otherwise the reference count will be messed up. Notice that the
- <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentSkipListMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentSkipListMap</code></a> can not guarantee that.</div>
+ <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#k (key, func).
+ Besides, the func method must execute exactly once only when the key is present and under the
+ lock context, otherwise the reference count will be messed up. Notice that the
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentSkipListMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentSkipListMap</code></a> can not guarantee that. Some code using
+ #computeIfPresent also expects the supplier to be executed only once. ConcurrentHashMap can
+ guarantee that. Other types may not.</div>
 </li>
 </ul>
 <a name="evictionLock">
@@ -1100,7 +1101,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictionLock</h4>
-<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReentrantLock.html?is-external=true" title="class or interface in java.util.concurrent.locks">ReentrantLock</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.158">evictionLock</a></pre>
+<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReentrantLock.html?is-external=true" title="class or interface in java.util.concurrent.locks">ReentrantLock</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.161">evictionLock</a></pre>
 <div class="block">Eviction lock (locked when eviction in process)</div>
 </li>
 </ul>
@@ -1110,7 +1111,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>maxBlockSize</h4>
-<pre>private final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.160">maxBlockSize</a></pre>
+<pre>private final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.163">maxBlockSize</a></pre>
 </li>
 </ul>
 <a name="evictionInProgress">
@@ -1119,7 +1120,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictionInProgress</h4>
-<pre>private volatile&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.163">evictionInProgress</a></pre>
+<pre>private volatile&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.166">evictionInProgress</a></pre>
 <div class="block">Volatile boolean to track if we are in an eviction process or not</div>
 </li>
 </ul>
@@ -1129,7 +1130,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictionThread</h4>
-<pre>private final transient&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.EvictionThread</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.166">evictionThread</a></pre>
+<pre>private final transient&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.EvictionThread</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.169">evictionThread</a></pre>
 <div class="block">Eviction thread</div>
 </li>
 </ul>
@@ -1139,7 +1140,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>scheduleThreadPool</h4>
-<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ScheduledExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ScheduledExecutorService</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.169">scheduleThreadPool</a></pre>
+<pre>private final transient&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ScheduledExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ScheduledExecutorService</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.172">scheduleThreadPool</a></pre>
 <div class="block">Statistics thread schedule pool (for heavy debugging, could remove)</div>
 </li>
 </ul>
@@ -1149,7 +1150,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.174">size</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.177">size</a></pre>
 <div class="block">Current size of cache</div>
 </li>
 </ul>
@@ -1159,7 +1160,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>dataBlockSize</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.177">dataBlockSize</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.180">dataBlockSize</a></pre>
 <div class="block">Current size of data blocks</div>
 </li>
 </ul>
@@ -1169,7 +1170,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>indexBlockSize</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.180">indexBlockSize</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.183">indexBlockSize</a></pre>
 <div class="block">Current size of index blocks</div>
 </li>
 </ul>
@@ -1179,7 +1180,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>bloomBlockSize</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.183">bloomBlockSize</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.186">bloomBlockSize</a></pre>
 <div class="block">Current size of bloom blocks</div>
 </li>
 </ul>
@@ -1189,7 +1190,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>elements</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.186">elements</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.189">elements</a></pre>
 <div class="block">Current number of cached elements</div>
 </li>
 </ul>
@@ -1199,7 +1200,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>dataBlockElements</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.189">dataBlockElements</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.192">dataBlockElements</a></pre>
 <div class="block">Current number of cached data block elements</div>
 </li>
 </ul>
@@ -1209,7 +1210,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>indexBlockElements</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.192">indexBlockElements</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.195">indexBlockElements</a></pre>
 <div class="block">Current number of cached index block elements</div>
 </li>
 </ul>
@@ -1219,7 +1220,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>bloomBlockElements</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.195">bloomBlockElements</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true" title="class or interface in java.util.concurrent.atomic">LongAdder</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.198">bloomBlockElements</a></pre>
 <div class="block">Current number of cached bloom block elements</div>
 </li>
 </ul>
@@ -1229,7 +1230,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>count</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.198">count</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.201">count</a></pre>
 <div class="block">Cache access count (sequential ID)</div>
 </li>
 </ul>
@@ -1239,7 +1240,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>hardCapacityLimitFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.201">hardCapacityLimitFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.204">hardCapacityLimitFactor</a></pre>
 <div class="block">hard capacity limit</div>
 </li>
 </ul>
@@ -1249,7 +1250,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>stats</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.204">stats</a></pre>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.207">stats</a></pre>
 <div class="block">Cache statistics</div>
 </li>
 </ul>
@@ -1259,7 +1260,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>maxSize</h4>
-<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.207">maxSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.210">maxSize</a></pre>
 <div class="block">Maximum allowable size of cache (block put if size > max, evict)</div>
 </li>
 </ul>
@@ -1269,7 +1270,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>blockSize</h4>
-<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.210">blockSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.213">blockSize</a></pre>
 <div class="block">Approximate block size</div>
 </li>
 </ul>
@@ -1279,7 +1280,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>acceptableFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.213">acceptableFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.216">acceptableFactor</a></pre>
 <div class="block">Acceptable size of cache (no evictions if size < acceptable)</div>
 </li>
 </ul>
@@ -1289,7 +1290,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>minFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.216">minFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.219">minFactor</a></pre>
 <div class="block">Minimum threshold of cache (when evicting, evict until size < min)</div>
 </li>
 </ul>
@@ -1299,7 +1300,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>singleFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.219">singleFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.222">singleFactor</a></pre>
 <div class="block">Single access bucket size</div>
 </li>
 </ul>
@@ -1309,7 +1310,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>multiFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.222">multiFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.225">multiFactor</a></pre>
 <div class="block">Multiple access bucket size</div>
 </li>
 </ul>
@@ -1319,7 +1320,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>memoryFactor</h4>
-<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.225">memoryFactor</a></pre>
+<pre>private&nbsp;float <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.228">memoryFactor</a></pre>
 <div class="block">In-memory bucket size</div>
 </li>
 </ul>
@@ -1329,7 +1330,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>overhead</h4>
-<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.228">overhead</a></pre>
+<pre>private&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.231">overhead</a></pre>
 <div class="block">Overhead of the structure itself</div>
 </li>
 </ul>
@@ -1339,7 +1340,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>forceInMemory</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.231">forceInMemory</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.234">forceInMemory</a></pre>
 <div class="block">Whether in-memory hfile's data block has higher priority when evicting</div>
 </li>
 </ul>
@@ -1349,7 +1350,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>victimHandler</h4>
-<pre>private transient&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.237">victimHandler</a></pre>
+<pre>private transient&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.240">victimHandler</a></pre>
 <div class="block">Where to send victims (blocks evicted/missing from the cache). This is used only when we use an
  external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache</div>
 </li>
@@ -1360,7 +1361,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CACHE_FIXED_OVERHEAD</h4>
-<pre>public static final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1032">CACHE_FIXED_OVERHEAD</a></pre>
+<pre>public static final&nbsp;long <a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1046">CACHE_FIXED_OVERHEAD</a></pre>
 </li>
 </ul>
 </li>
@@ -1377,7 +1378,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LruBlockCache</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.247">LruBlockCache</a>(long&nbsp;maxSize,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.250">LruBlockCache</a>(long&nbsp;maxSize,
                      long&nbsp;blockSize)</pre>
 <div class="block">Default constructor. Specify maximum size and expected average block size (approximation is
  fine).
@@ -1396,7 +1397,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LruBlockCache</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.254">LruBlockCache</a>(long&nbsp;maxSize,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.257">LruBlockCache</a>(long&nbsp;maxSize,
                      long&nbsp;blockSize,
                      boolean&nbsp;evictionThread)</pre>
 <div class="block">Constructor used for testing. Allows disabling of the eviction thread.</div>
@@ -1408,7 +1409,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LruBlockCache</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.261">LruBlockCache</a>(long&nbsp;maxSize,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.264">LruBlockCache</a>(long&nbsp;maxSize,
                      long&nbsp;blockSize,
                      boolean&nbsp;evictionThread,
                      org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
@@ -1420,7 +1421,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>LruBlockCache</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.274">LruBlockCache</a>(long&nbsp;maxSize,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.277">LruBlockCache</a>(long&nbsp;maxSize,
                      long&nbsp;blockSize,
                      org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
@@ -1431,7 +1432,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LruBlockCache</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.292">LruBlockCache</a>(long&nbsp;maxSize,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.295">LruBlockCache</a>(long&nbsp;maxSize,
                      long&nbsp;blockSize,
                      boolean&nbsp;evictionThread,
                      int&nbsp;mapInitialSize,
@@ -1476,7 +1477,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>setVictimCache</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.338">setVictimCache</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a>&nbsp;victimCache)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.341">setVictimCache</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a>&nbsp;victimCache)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/FirstLevelBlockCache.html#setVictimCache-org.apache.hadoop.hbase.io.hfile.BlockCache-">FirstLevelBlockCache</a></code></span></div>
 <div class="block">Specifies the secondary cache. An entry that is evicted from this cache due to a size
  constraint will be inserted into the victim cache.</div>
@@ -1494,7 +1495,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>setMaxSize</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.346">setMaxSize</a>(long&nbsp;maxSize)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.349">setMaxSize</a>(long&nbsp;maxSize)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/ResizableBlockCache.html#setMaxSize-long-">ResizableBlockCache</a></code></span></div>
 <div class="block">Sets the max heap size that can be used by the BlockCache.</div>
 <dl>
@@ -1511,7 +1512,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>asReferencedHeapBlock</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.368">asReferencedHeapBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</pre>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.371">asReferencedHeapBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</pre>
 <div class="block">The block cached in LRUBlockCache will always be an heap block: on the one side, the heap
  access will be more faster then off-heap, the small index block or meta block cached in
  CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always
@@ -1537,7 +1538,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheBlock</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.391">cacheBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.394">cacheBlock</a>(<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)</pre>
 <div class="block">Cache the block with the specified name and buffer.
@@ -1560,7 +1561,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>assertCounterSanity</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.450">assertCounterSanity</a>(long&nbsp;mapSize,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.453">assertCounterSanity</a>(long&nbsp;mapSize,
                                         long&nbsp;counterVal)</pre>
 <div class="block">Sanity-checking for parity between actual block cache content and metrics. Intended only for
  use with TRACE level logging and -ea JVM.</div>
@@ -1572,7 +1573,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheBlock</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.476">cacheBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.479">cacheBlock</a>(<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)</pre>
 <div class="block">Cache the block with the specified name and buffer.
  <p>
@@ -1595,7 +1596,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>updateSizeMetrics</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.484">updateSizeMetrics</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;cb,
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.487">updateSizeMetrics</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;cb,
                                boolean&nbsp;evict)</pre>
 <div class="block">Helper function that updates the local size counter and also updates any per-cf or
  per-blocktype metrics it can discern from given <a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile"><code>LruCachedBlock</code></a></div>
@@ -1607,7 +1608,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getBlock</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.512">getBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.515">getBlock</a>(<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)</pre>
@@ -1632,7 +1633,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>containsBlock</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.554">containsBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.558">containsBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</pre>
 <div class="block">Whether the cache contains block with specified cacheKey</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1650,7 +1651,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictBlock</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.559">evictBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.563">evictBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-">BlockCache</a></code></span></div>
 <div class="block">Evict block from cache.</div>
 <dl>
@@ -1669,7 +1670,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictBlocksByHfileName</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.573">evictBlocksByHfileName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hfileName)</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.577">evictBlocksByHfileName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hfileName)</pre>
 <div class="block">Evicts all blocks for a specific HFile. This is an expensive operation implemented as a
  linear-time search through all blocks in the cache. Ideally this should be a search in a
  log-access-time map.
@@ -1689,7 +1690,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evictBlock</h4>
-<pre>protected&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.594">evictBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block,
+<pre>protected&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.598">evictBlock</a>(<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&nbsp;block,
                           boolean&nbsp;evictedByEvictionProcess)</pre>
 <div class="block">Evict the block, and it will be cached by the victim handler if exists &amp;&amp; block may be
  read again later</div>
@@ -1707,7 +1708,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>runEviction</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.631">runEviction</a>()</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.645">runEviction</a>()</pre>
 <div class="block">Multi-threaded call to run the eviction process.</div>
 </li>
 </ul>
@@ -1717,7 +1718,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>isEvictionInProgress</h4>
-<pre>boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.639">isEvictionInProgress</a>()</pre>
+<pre>boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.653">isEvictionInProgress</a>()</pre>
 </li>
 </ul>
 <a name="getOverhead--">
@@ -1726,7 +1727,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getOverhead</h4>
-<pre>long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.643">getOverhead</a>()</pre>
+<pre>long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.657">getOverhead</a>()</pre>
 </li>
 </ul>
 <a name="evict--">
@@ -1735,7 +1736,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>evict</h4>
-<pre>void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.650">evict</a>()</pre>
+<pre>void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.664">evict</a>()</pre>
 <div class="block">Eviction method.</div>
 </li>
 </ul>
@@ -1745,7 +1746,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.771">toString</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.785">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -1758,7 +1759,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaxSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.865">getMaxSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.879">getMaxSize</a>()</pre>
 <div class="block">Get the maximum size of this cache.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1774,7 +1775,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.870">getCurrentSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.884">getCurrentSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getCurrentSize--">BlockCache</a></code></span></div>
 <div class="block">Returns the occupied size of the block cache, in bytes.</div>
 <dl>
@@ -1791,7 +1792,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentDataSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.875">getCurrentDataSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.889">getCurrentDataSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getCurrentDataSize--">BlockCache</a></code></span></div>
 <div class="block">Returns the occupied size of data blocks, in bytes.</div>
 <dl>
@@ -1808,7 +1809,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentIndexSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.879">getCurrentIndexSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.893">getCurrentIndexSize</a>()</pre>
 </li>
 </ul>
 <a name="getCurrentBloomSize--">
@@ -1817,7 +1818,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentBloomSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.883">getCurrentBloomSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.897">getCurrentBloomSize</a>()</pre>
 </li>
 </ul>
 <a name="getFreeSize--">
@@ -1826,7 +1827,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getFreeSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.888">getFreeSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.902">getFreeSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getFreeSize--">BlockCache</a></code></span></div>
 <div class="block">Returns the free size of the block cache, in bytes.</div>
 <dl>
@@ -1843,7 +1844,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.893">size</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.907">size</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#size--">BlockCache</a></code></span></div>
 <div class="block">Returns the total size of the block cache, in bytes.</div>
 <dl>
@@ -1860,7 +1861,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getBlockCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.898">getBlockCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.912">getBlockCount</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCount--">BlockCache</a></code></span></div>
 <div class="block">Returns the number of blocks currently cached in the block cache.</div>
 <dl>
@@ -1877,7 +1878,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getDataBlockCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.903">getDataBlockCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.917">getDataBlockCount</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getDataBlockCount--">BlockCache</a></code></span></div>
 <div class="block">Returns the number of data blocks currently cached in the block cache.</div>
 <dl>
@@ -1894,7 +1895,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getIndexBlockCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.907">getIndexBlockCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.921">getIndexBlockCount</a>()</pre>
 </li>
 </ul>
 <a name="getBloomBlockCount--">
@@ -1903,7 +1904,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getBloomBlockCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.911">getBloomBlockCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.925">getBloomBlockCount</a>()</pre>
 </li>
 </ul>
 <a name="getEvictionThread--">
@@ -1912,7 +1913,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getEvictionThread</h4>
-<pre><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.EvictionThread</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.915">getEvictionThread</a>()</pre>
+<pre><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html" title="class in org.apache.hadoop.hbase.io.hfile">LruBlockCache.EvictionThread</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.929">getEvictionThread</a>()</pre>
 </li>
 </ul>
 <a name="logStats--">
@@ -1921,7 +1922,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>logStats</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1002">logStats</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1016">logStats</a>()</pre>
 </li>
 </ul>
 <a name="getStats--">
@@ -1930,7 +1931,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getStats</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1028">getStats</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1042">getStats</a>()</pre>
 <div class="block">Get counter statistics for this cache.
  <p>
  Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.</div>
@@ -1946,7 +1947,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>heapSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1036">heapSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1050">heapSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/HeapSize.html#heapSize--">HeapSize</a></code></span></div>
 <div class="block">Return the approximate 'exclusive deep size' of implementing object. Includes count of payload
  and hosting object sizings.</div>
@@ -1962,7 +1963,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>calculateOverhead</h4>
-<pre>private static&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1040">calculateOverhead</a>(long&nbsp;maxSize,
+<pre>private static&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1054">calculateOverhead</a>(long&nbsp;maxSize,
                                       long&nbsp;blockSize,
                                       int&nbsp;concurrency)</pre>
 </li>
@@ -1973,7 +1974,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>iterator</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" title="interface in org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1048">iterator</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html" title="interface in org.apache.hadoop.hbase.io.hfile">CachedBlock</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1062">iterator</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#iterator--">BlockCache</a></code></span></div>
 <div class="block">Returns Iterator over the blocks in the cache.</div>
 <dl>
@@ -1990,7 +1991,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>acceptableSize</h4>
-<pre>long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1140">acceptableSize</a>()</pre>
+<pre>long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1154">acceptableSize</a>()</pre>
 </li>
 </ul>
 <a name="minSize--">
@@ -1999,7 +2000,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>minSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1144">minSize</a>()</pre>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1158">minSize</a>()</pre>
 </li>
 </ul>
 <a name="singleSize--">
@@ -2008,7 +2009,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>singleSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1148">singleSize</a>()</pre>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1162">singleSize</a>()</pre>
 </li>
 </ul>
 <a name="multiSize--">
@@ -2017,7 +2018,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>multiSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1152">multiSize</a>()</pre>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1166">multiSize</a>()</pre>
 </li>
 </ul>
 <a name="memorySize--">
@@ -2026,7 +2027,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>memorySize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1156">memorySize</a>()</pre>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1170">memorySize</a>()</pre>
 </li>
 </ul>
 <a name="shutdown--">
@@ -2035,7 +2036,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1161">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1175">shutdown</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#shutdown--">BlockCache</a></code></span></div>
 <div class="block">Shutdown the cache.</div>
 <dl>
@@ -2050,7 +2051,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>clearCache</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1186">clearCache</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1200">clearCache</a>()</pre>
 <div class="block">Clears the cache. Used in tests.</div>
 </li>
 </ul>
@@ -2060,7 +2061,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getCachedFileNamesForTest</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1195">getCachedFileNamesForTest</a>()</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1209">getCachedFileNamesForTest</a>()</pre>
 <div class="block">Used in testing. May be very inefficient.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -2074,7 +2075,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getEncodingCountsForTest</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum in org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1203">getEncodingCountsForTest</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum in org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1217">getEncodingCountsForTest</a>()</pre>
 </li>
 </ul>
 <a name="getMapForTests--">
@@ -2083,7 +2084,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getMapForTests</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1213">getMapForTests</a>()</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1227">getMapForTests</a>()</pre>
 </li>
 </ul>
 <a name="getBlockCaches--">
@@ -2092,7 +2093,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getBlockCaches</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1218">getBlockCaches</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" title="interface in org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#line.1232">getBlockCaches</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCaches--">BlockCache</a></code></span></div>
 <div class="block">Returns The list of sub blockcaches that make up this one; returns null if no sub caches.</div>
 <dl>
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 088ba7a..3878ae9 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
@@ -137,8 +137,7 @@
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">LruBlockCache.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#map">map</a></span></code>
 <div class="block">Defined the cache map as <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentHashMap</code></a> here, because in
- <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#computeIfPresent
- (key, func).</div>
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#k (key, func).</div>
 </td>
 </tr>
 <tr class="altColor">
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
index 30d7a22..e43c5ff 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/LruCachedBlock.html
@@ -109,8 +109,7 @@
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" title="class in org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>,<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruCachedBlock.html" title="class in org.apache.hadoop.hbase.io.hfile">LruCachedBlock</a>&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">LruBlockCache.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#map">map</a></span></code>
 <div class="block">Defined the cache map as <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentHashMap</code></a> here, because in
- <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#computeIfPresent
- (key, func).</div>
+ <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock-org.apache.hadoop.hbase.io.hfile.BlockCacheKey-boolean-boolean-boolean-"><code>LruBlockCache.getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey, boolean, boolean, boolean)</code></a>, we need to guarantee the atomicity of map#k (key, func).</div>
 </td>
 </tr>
 <tr class="rowColor">
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 316e53b..9af1e39 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -321,10 +321,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockCacheFactory.ExternalBlockCaches</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/ReaderContext.ReaderType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">ReaderContext.ReaderType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index cc27729..794fcba 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -368,8 +368,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index a78a094..7d471dc 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -303,11 +303,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/WALPlayer.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">WALPlayer.Counter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/WALPlayer.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">WALPlayer.Counter</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
index dbef7bc..52169c3 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
@@ -151,8 +151,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.TransitionType.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">TransitRegionStateProcedure.TransitionType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/ServerState.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">ServerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.TransitionType.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">TransitRegionStateProcedure.TransitionType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
index 0a4c20c..c7478b7 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
@@ -221,9 +221,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.GeneratorType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">StochasticLoadBalancer.GeneratorType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BalancerClusterState.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BalancerClusterState.LocalityType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BalanceAction.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BalanceAction.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BalancerClusterState.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BalancerClusterState.LocalityType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.GeneratorType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">StochasticLoadBalancer.GeneratorType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 5a6d577..f8677a1 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -322,12 +322,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/ServerManager.ServerLiveState.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">ServerManager.ServerLiveState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/ServerManager.ServerLiveState.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">ServerManager.ServerLiveState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/monitoring/package-tree.html b/devapidocs/org/apache/hadoop/hbase/monitoring/package-tree.html
index 78f0d31..6025074 100644
--- a/devapidocs/org/apache/hadoop/hbase/monitoring/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/monitoring/package-tree.html
@@ -127,8 +127,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.monitoring.<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.State.html" title="enum in org.apache.hadoop.hbase.monitoring"><span class="typeNameLink">MonitoredTask.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.monitoring.<a href="../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.TaskFilter.TaskType.html" title="enum in org.apache.hadoop.hbase.monitoring"><span class="typeNameLink">TaskMonitor.TaskFilter.TaskType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.monitoring.<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.State.html" title="enum in org.apache.hadoop.hbase.monitoring"><span class="typeNameLink">MonitoredTask.State</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 1c8d520..2ff0ac2 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -484,22 +484,22 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaRegionLocationCache.ZNodeOpType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaRegionLocationCache.ZNodeOpType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ServerTask.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ServerTask.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CatalogReplicaMode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CatalogReplicaMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClientMetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClientMetaTableAccessor.QueryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ServerTask.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ServerTask.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClientMetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClientMetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaRegionLocationCache.ZNodeOpType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaRegionLocationCache.ZNodeOpType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CatalogReplicaMode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CatalogReplicaMode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 392762f..3f75e45 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -218,9 +218,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index deab042..5cd0434 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -240,12 +240,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 132457f..d822ed2 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -749,20 +749,20 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ReadPointCalculationLock.LockType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ReadPointCalculationLock.LockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index b5eec1e..20aca21 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/package-tree.html
index 16aa28f..1333e55 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/package-tree.html
@@ -132,8 +132,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.storefiletracker.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/storefiletracker/ModifyStoreFileTrackerProcedure.StoreFileTrackerState.html" title="enum in org.apache.hadoop.hbase.regionserver.storefiletracker"><span class="typeNameLink">ModifyStoreFileTrackerProcedure.StoreFileTrackerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.storefiletracker.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerFactory.Trackers.html" title="enum in org.apache.hadoop.hbase.regionserver.storefiletracker"><span class="typeNameLink">StoreFileTrackerFactory.Trackers</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.storefiletracker.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/storefiletracker/ModifyStoreFileTrackerProcedure.StoreFileTrackerState.html" title="enum in org.apache.hadoop.hbase.regionserver.storefiletracker"><span class="typeNameLink">ModifyStoreFileTrackerProcedure.StoreFileTrackerState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
index 978c47e..1bb12cc 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
@@ -245,9 +245,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/WALEventTrackerListener.WalState.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">WALEventTrackerListener.WalState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/WALEventTrackerListener.WalState.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">WALEventTrackerListener.WalState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.RollRequestReason.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">WALActionsListener.RollRequestReason</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
index 004bd9c..205d7a6 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
@@ -187,9 +187,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/SyncReplicationState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">SyncReplicationState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerStorageType.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeerStorageType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
index c1825e6..773cffb 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
@@ -217,8 +217,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.HasNext.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">WALEntryStream.HasNext</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.HasNext.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">WALEntryStream.HasNext</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.SourceHolder.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">MetricsReplicationSourceFactoryImpl.SourceHolder</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
index 4759df0..08844c3 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
@@ -110,8 +110,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index b45277e..04f6a88 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -162,11 +162,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Scope.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Scope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 5c1834b..307514f 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -196,8 +196,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 09b80d2..55c57da 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -212,8 +212,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ImplType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/trace/package-tree.html b/devapidocs/org/apache/hadoop/hbase/trace/package-tree.html
index d11adda..a0bda00 100644
--- a/devapidocs/org/apache/hadoop/hbase/trace/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/trace/package-tree.html
@@ -97,9 +97,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.trace.<a href="../../../../../org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.Operation.html" title="enum in org.apache.hadoop.hbase.trace"><span class="typeNameLink">HBaseSemanticAttributes.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.trace.<a href="../../../../../org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.RpcSystem.html" title="enum in org.apache.hadoop.hbase.trace"><span class="typeNameLink">HBaseSemanticAttributes.RpcSystem</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.trace.<a href="../../../../../org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.ReadType.html" title="enum in org.apache.hadoop.hbase.trace"><span class="typeNameLink">HBaseSemanticAttributes.ReadType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.trace.<a href="../../../../../org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.RpcSystem.html" title="enum in org.apache.hadoop.hbase.trace"><span class="typeNameLink">HBaseSemanticAttributes.RpcSystem</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.trace.<a href="../../../../../org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.Operation.html" title="enum in org.apache.hadoop.hbase.trace"><span class="typeNameLink">HBaseSemanticAttributes.Operation</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 172b110..48b13a5 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -537,15 +537,15 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLockWithObjectPool.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLockWithObjectPool.ReferenceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HbckErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HbckErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLockWithObjectPool.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLockWithObjectPool.ReferenceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/DNS.ServerType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">DNS.ServerType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 51773e4..0d7bf04 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -198,9 +198,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALTailingReader.State.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALTailingReader.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALTailingReader.State.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALTailingReader.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.File.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileConverter.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
index 054b776..bbd85a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
@@ -577,255 +577,269 @@
 <span class="sourceLineNo">569</span>          + " because it does not exist! Skipping and continuing on.", fnfe);<a name="line.569"></a>
 <span class="sourceLineNo">570</span>        success = true;<a name="line.570"></a>
 <span class="sourceLineNo">571</span>      } catch (IOException e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        success = false;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (!success) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      LOG.error("Failed to archive " + currentFile);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      return false;<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return true;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param fs        FileSystem from which to delete the region<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException on filesystem operation failure<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (fs.delete(regionDir, true)) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug("Deleted {}", regionDir);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Just do a simple delete of the given store files<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * &lt;p&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   * &lt;p&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * @param compactedFiles store files to delete from the file system.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    throws IOException {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    LOG.debug("Deleting files without archiving.");<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        hsf.deleteStoreFile();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        errors.add(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    if (errors.size() &gt; 0) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      throw MultipleIOException.createIOException(errors);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * archival/removal of files<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    protected final FileSystem fs;<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>    public FileConverter(FileSystem fs) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      this.fs = fs;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    public FileStatusConverter(FileSystem fs) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      super(fs);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    @Override<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    public File apply(FileStatus input) {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      return new FileablePath(fs, input.getPath());<a name="line.652"></a>
+<span class="sourceLineNo">572</span>        success = false;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // When HFiles are placed on a filesystem other than HDFS a rename operation can be a<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // non-atomic file copy operation. It can take a long time to copy a large hfile and if<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        // interrupted there may be a partially copied file present at the destination. We must<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        // remove the partially copied file, if any, or otherwise the archive operation will fail<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        // indefinitely from this point.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        LOG.warn("Failed to archive " + currentFile + " on try #" + i, e);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          fs.delete(archiveFile, false);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        } catch (FileNotFoundException fnfe) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          // This case is fine.<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        } catch (IOException ee) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>          // Complain about other IO exceptions<a name="line.584"></a>
+<span class="sourceLineNo">585</span>          LOG.warn("Failed to clean up from failure to archive " + currentFile + " on try #" + i,<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            ee);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    if (!success) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      LOG.error("Failed to archive " + currentFile);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      return false;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    LOG.debug("Archived from {} to {}", currentFile, archiveFile);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    return true;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * Without regard for backup, delete a region. Should be used with caution.<a name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @param regionDir {@link Path} to the region to be deleted.<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @param fs        FileSystem from which to delete the region<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * @return &lt;tt&gt;true&lt;/tt&gt; on successful deletion, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * @throws IOException on filesystem operation failure<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  private static boolean deleteRegionWithoutArchiving(FileSystem fs, Path regionDir)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    throws IOException {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    if (fs.delete(regionDir, true)) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      LOG.debug("Deleted {}", regionDir);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return true;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    LOG.debug("Failed to delete directory {}", regionDir);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    return false;<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * Just do a simple delete of the given store files<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   * &lt;p&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * A best effort is made to delete each of the files, rather than bailing on the first failure.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * &lt;p&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @param compactedFiles store files to delete from the file system.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * @throws IOException if a file cannot be deleted. All files will be attempted to deleted before<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   *                     throwing the exception, rather than failing at the first file.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>  private static void deleteStoreFilesWithoutArchiving(Collection&lt;HStoreFile&gt; compactedFiles)<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    throws IOException {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    LOG.debug("Deleting files without archiving.");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    List&lt;IOException&gt; errors = new ArrayList&lt;&gt;(0);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    for (HStoreFile hsf : compactedFiles) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        hsf.deleteStoreFile();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } catch (IOException e) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        LOG.error("Failed to delete {}", hsf.getPath());<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        errors.add(e);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      }<a name="line.636"></a>
+<span class="sourceLineNo">637</span>    }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    if (errors.size() &gt; 0) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      throw MultipleIOException.createIOException(errors);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>  /**<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   * Adapt a type to match the {@link File} interface, which is used internally for handling<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   * archival/removal of files<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * @param &lt;T&gt; type to adapt to the {@link File} interface<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  private static abstract class FileConverter&lt;T&gt; implements Function&lt;T, File&gt; {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    protected final FileSystem fs;<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    public FileConverter(FileSystem fs) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      this.fs = fs;<a name="line.652"></a>
 <span class="sourceLineNo">653</span>    }<a name="line.653"></a>
 <span class="sourceLineNo">654</span>  }<a name="line.654"></a>
 <span class="sourceLineNo">655</span><a name="line.655"></a>
 <span class="sourceLineNo">656</span>  /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.657"></a>
+<span class="sourceLineNo">657</span>   * Convert a FileStatus to something we can manage in the archiving<a name="line.657"></a>
 <span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public StoreToFile(FileSystem fs) {<a name="line.660"></a>
+<span class="sourceLineNo">659</span>  private static class FileStatusConverter extends FileConverter&lt;FileStatus&gt; {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    public FileStatusConverter(FileSystem fs) {<a name="line.660"></a>
 <span class="sourceLineNo">661</span>      super(fs);<a name="line.661"></a>
 <span class="sourceLineNo">662</span>    }<a name="line.662"></a>
 <span class="sourceLineNo">663</span><a name="line.663"></a>
 <span class="sourceLineNo">664</span>    @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    public File apply(HStoreFile input) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return new FileableStoreFile(fs, input);<a name="line.666"></a>
+<span class="sourceLineNo">665</span>    public File apply(FileStatus input) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      return new FileablePath(fs, input.getPath());<a name="line.666"></a>
 <span class="sourceLineNo">667</span>    }<a name="line.667"></a>
 <span class="sourceLineNo">668</span>  }<a name="line.668"></a>
 <span class="sourceLineNo">669</span><a name="line.669"></a>
 <span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wrapper to handle file operations uniformly<a name="line.671"></a>
+<span class="sourceLineNo">671</span>   * Convert the {@link HStoreFile} into something we can manage in the archive methods<a name="line.671"></a>
 <span class="sourceLineNo">672</span>   */<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  private static abstract class File {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    protected final FileSystem fs;<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    public File(FileSystem fs) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      this.fs = fs;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>     * Delete the file<a name="line.681"></a>
-<span class="sourceLineNo">682</span>     * @throws IOException on failure<a name="line.682"></a>
-<span class="sourceLineNo">683</span>     */<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    abstract void delete() throws IOException;<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>     * Check to see if this is a file or a directory<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    abstract boolean isFile() throws IOException;<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         an empty list<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     */<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span>    /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>     * close any outside readers of the file<a name="line.700"></a>
-<span class="sourceLineNo">701</span>     */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    abstract void close() throws IOException;<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    abstract String getName();<a name="line.705"></a>
+<span class="sourceLineNo">673</span>  private static class StoreToFile extends FileConverter&lt;HStoreFile&gt; {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    public StoreToFile(FileSystem fs) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      super(fs);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>    @Override<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    public File apply(HStoreFile input) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      return new FileableStoreFile(fs, input);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * Wrapper to handle file operations uniformly<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>  private static abstract class File {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    protected final FileSystem fs;<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    public File(FileSystem fs) {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      this.fs = fs;<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    }<a name="line.692"></a>
+<span class="sourceLineNo">693</span><a name="line.693"></a>
+<span class="sourceLineNo">694</span>    /**<a name="line.694"></a>
+<span class="sourceLineNo">695</span>     * Delete the file<a name="line.695"></a>
+<span class="sourceLineNo">696</span>     * @throws IOException on failure<a name="line.696"></a>
+<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    abstract void delete() throws IOException;<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>    /**<a name="line.700"></a>
+<span class="sourceLineNo">701</span>     * Check to see if this is a file or a directory<a name="line.701"></a>
+<span class="sourceLineNo">702</span>     * @return &lt;tt&gt;true&lt;/tt&gt; if it is a file, &lt;tt&gt;false&lt;/tt&gt; otherwise<a name="line.702"></a>
+<span class="sourceLineNo">703</span>     * @throws IOException on {@link FileSystem} connection error<a name="line.703"></a>
+<span class="sourceLineNo">704</span>     */<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    abstract boolean isFile() throws IOException;<a name="line.705"></a>
 <span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>    /** Returns the path to this file */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    abstract Path getPath();<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>     * Move the file to the given destination<a name="line.711"></a>
-<span class="sourceLineNo">712</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.712"></a>
-<span class="sourceLineNo">713</span>     */<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      this.close();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      Path p = this.getPath();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    public FileSystem getFileSystem() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      return this.fs;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public String toString() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
-<span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
-<span class="sourceLineNo">732</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  private static class FileablePath extends File {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    private final Path file;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    private final FileStatusConverter getAsFile;<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      super(fs);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      this.file = file;<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.741"></a>
+<span class="sourceLineNo">707</span>    /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>     * @return if this is a directory, returns all the children in the directory, otherwise returns<a name="line.708"></a>
+<span class="sourceLineNo">709</span>     *         an empty list<a name="line.709"></a>
+<span class="sourceLineNo">710</span>     */<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    abstract Collection&lt;File&gt; getChildren() throws IOException;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>     * close any outside readers of the file<a name="line.714"></a>
+<span class="sourceLineNo">715</span>     */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    abstract void close() throws IOException;<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span>    /** Returns the name of the file (not the full fs path, just the individual file name) */<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    abstract String getName();<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>    /** Returns the path to this file */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    abstract Path getPath();<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span>    /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span>     * Move the file to the given destination<a name="line.725"></a>
+<span class="sourceLineNo">726</span>     * @return &lt;tt&gt;true&lt;/tt&gt; on success<a name="line.726"></a>
+<span class="sourceLineNo">727</span>     */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public boolean moveAndClose(Path dest) throws IOException {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      this.close();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      Path p = this.getPath();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return CommonFSUtils.renameAndSetModifyTime(fs, p, dest);<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>    /** Returns the {@link FileSystem} on which this file resides */<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    public FileSystem getFileSystem() {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      return this.fs;<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span><a name="line.738"></a>
+<span class="sourceLineNo">739</span>    @Override<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    public String toString() {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return this.getClass().getSimpleName() + ", " + getPath().toString();<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>    @Override<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    public void delete() throws IOException {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>    @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    public String getName() {<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      return file.getName();<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    @Override<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      if (fs.isFile(file)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        return Collections.emptyList();<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>    @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    public boolean isFile() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      return fs.isFile(file);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>    @Override<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    public void close() throws IOException {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>      // NOOP - files are implicitly closed on removal<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>    @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    Path getPath() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      return file;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  }<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>  /**<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  private static class FileableStoreFile extends File {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    HStoreFile file;<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      super(fs);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      this.file = store;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>    @Override<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    public void delete() throws IOException {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      file.deleteStoreFile();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    }<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    @Override<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public String getName() {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      return file.getPath().getName();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    @Override<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    public boolean isFile() {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      return true;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>    @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      // storefiles don't have children<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return Collections.emptyList();<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    @Override<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    public void close() throws IOException {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      file.closeStoreFile(true);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    }<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    @Override<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    Path getPath() {<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return file.getPath();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>}<a name="line.820"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
+<span class="sourceLineNo">746</span>   * A {@link File} that wraps a simple {@link Path} on a {@link FileSystem}.<a name="line.746"></a>
+<span class="sourceLineNo">747</span>   */<a name="line.747"></a>
+<span class="sourceLineNo">748</span>  private static class FileablePath extends File {<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    private final Path file;<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    private final FileStatusConverter getAsFile;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span>    public FileablePath(FileSystem fs, Path file) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      super(fs);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      this.file = file;<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      this.getAsFile = new FileStatusConverter(fs);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>    }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>    @Override<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    public void delete() throws IOException {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      if (!fs.delete(file, true)) throw new IOException("Failed to delete:" + this.file);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    public String getName() {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      return file.getName();<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>    @Override<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      if (fs.isFile(file)) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        return Collections.emptyList();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      }<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      return Stream.of(fs.listStatus(file)).map(getAsFile).collect(Collectors.toList());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    }<a name="line.774"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    @Override<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    public boolean isFile() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      return fs.isFile(file);<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span>    @Override<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    public void close() throws IOException {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>      // NOOP - files are implicitly closed on removal<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    @Override<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    Path getPath() {<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      return file;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * {@link File} adapter for a {@link HStoreFile} living on a {@link FileSystem} .<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  private static class FileableStoreFile extends File {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    HStoreFile file;<a name="line.796"></a>
+<span class="sourceLineNo">797</span><a name="line.797"></a>
+<span class="sourceLineNo">798</span>    public FileableStoreFile(FileSystem fs, HStoreFile store) {<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      super(fs);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      this.file = store;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>    @Override<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    public void delete() throws IOException {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      file.deleteStoreFile();<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span><a name="line.807"></a>
+<span class="sourceLineNo">808</span>    @Override<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public String getName() {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      return file.getPath().getName();<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    }<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>    @Override<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    public boolean isFile() {<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      return true;<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>    @Override<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    public Collection&lt;File&gt; getChildren() throws IOException {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      // storefiles don't have children<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      return Collections.emptyList();<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    }<a name="line.822"></a>
+<span class="sourceLineNo">823</span><a name="line.823"></a>
+<span class="sourceLineNo">824</span>    @Override<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    public void close() throws IOException {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      file.closeStoreFile(true);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>    @Override<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    Path getPath() {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      return file.getPath();<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span>}<a name="line.834"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
index 135c90c..ba4d7e9 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/SnappyCodec.html
@@ -39,94 +39,117 @@
 <span class="sourceLineNo">031</span>import org.apache.hadoop.io.compress.Compressor;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.apache.hadoop.io.compress.Decompressor;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.xerial.snappy.Snappy;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * Hadoop Snappy codec implemented with Xerial Snappy.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * This is data format compatible with Hadoop's native snappy codec.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a name="line.41"></a>
-<span class="sourceLineNo">042</span>public class SnappyCodec implements Configurable, CompressionCodec {<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  public static final String SNAPPY_BUFFER_SIZE_KEY = "hbase.io.compress.snappy.buffersize";<a name="line.44"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.xerial.snappy.Snappy;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * Hadoop Snappy codec implemented with Xerial Snappy.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * This is data format compatible with Hadoop's native snappy codec.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public class SnappyCodec implements Configurable, CompressionCodec {<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private Configuration conf;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  private int bufferSize;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public SnappyCodec() {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    conf = new Configuration();<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    bufferSize = getBufferSize(conf);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">046</span>  public static final String SNAPPY_BUFFER_SIZE_KEY = "hbase.io.compress.snappy.buffersize";<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  private static final Logger LOG = LoggerFactory.getLogger(SnappyCodec.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private Configuration conf;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  private int bufferSize;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  private static boolean loaded = false;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  private static Throwable loadError;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  @Override<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public Configuration getConf() {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    return conf;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public void setConf(Configuration conf) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    this.conf = conf;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    this.bufferSize = getBufferSize(conf);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public Compressor createCompressor() {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    return new SnappyCompressor(bufferSize);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  public Decompressor createDecompressor() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    return new SnappyDecompressor(bufferSize);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public CompressionInputStream createInputStream(InputStream in) throws IOException {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    return createInputStream(in, createDecompressor());<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  @Override<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public CompressionInputStream createInputStream(InputStream in, Decompressor d)<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    throws IOException {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    return new BlockDecompressorStream(in, d, bufferSize);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public CompressionOutputStream createOutputStream(OutputStream out) throws IOException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    return createOutputStream(out, createCompressor());<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public CompressionOutputStream createOutputStream(OutputStream out, Compressor c)<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    throws IOException {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    return new BlockCompressorStream(out, c, bufferSize,<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      Snappy.maxCompressedLength(bufferSize) - bufferSize); // overhead only<a name="line.95"></a>
+<span class="sourceLineNo">054</span>  static {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    try {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      Snappy.getNativeLibraryVersion();<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      loaded = true;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    } catch (Throwable t) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      loadError = t;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      LOG.error("The Snappy native libraries could not be loaded", t);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    }<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /** Return true if the native shared libraries were loaded; false otherwise. */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public static boolean isLoaded() {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    return loaded;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public SnappyCodec() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    if (!isLoaded()) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      throw new RuntimeException("Snappy codec could not be loaded", loadError);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    }<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    conf = new Configuration();<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    bufferSize = getBufferSize(conf);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  @Override<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  public Configuration getConf() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    return conf;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public void setConf(Configuration conf) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    this.conf = conf;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    this.bufferSize = getBufferSize(conf);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  @Override<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  public Compressor createCompressor() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    return new SnappyCompressor(bufferSize);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public Decompressor createDecompressor() {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    return new SnappyDecompressor(bufferSize);<a name="line.95"></a>
 <span class="sourceLineNo">096</span>  }<a name="line.96"></a>
 <span class="sourceLineNo">097</span><a name="line.97"></a>
 <span class="sourceLineNo">098</span>  @Override<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public Class&lt;? extends Compressor&gt; getCompressorType() {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    return SnappyCompressor.class;<a name="line.100"></a>
+<span class="sourceLineNo">099</span>  public CompressionInputStream createInputStream(InputStream in) throws IOException {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    return createInputStream(in, createDecompressor());<a name="line.100"></a>
 <span class="sourceLineNo">101</span>  }<a name="line.101"></a>
 <span class="sourceLineNo">102</span><a name="line.102"></a>
 <span class="sourceLineNo">103</span>  @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  public Class&lt;? extends Decompressor&gt; getDecompressorType() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    return SnappyDecompressor.class;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span>  @Override<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public String getDefaultExtension() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return ".snappy";<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  // Package private<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  static int getBufferSize(Configuration conf) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    return conf.getInt(SNAPPY_BUFFER_SIZE_KEY,<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      conf.getInt(CommonConfigurationKeys.IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        CommonConfigurationKeys.IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT));<a name="line.118"></a>
+<span class="sourceLineNo">104</span>  public CompressionInputStream createInputStream(InputStream in, Decompressor d)<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    throws IOException {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    return new BlockDecompressorStream(in, d, bufferSize);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  @Override<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public CompressionOutputStream createOutputStream(OutputStream out) throws IOException {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return createOutputStream(out, createCompressor());<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>  @Override<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public CompressionOutputStream createOutputStream(OutputStream out, Compressor c)<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    throws IOException {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return new BlockCompressorStream(out, c, bufferSize,<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      Snappy.maxCompressedLength(bufferSize) - bufferSize); // overhead only<a name="line.118"></a>
 <span class="sourceLineNo">119</span>  }<a name="line.119"></a>
 <span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>}<a name="line.121"></a>
+<span class="sourceLineNo">121</span>  @Override<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public Class&lt;? extends Compressor&gt; getCompressorType() {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    return SnappyCompressor.class;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  @Override<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public Class&lt;? extends Decompressor&gt; getDecompressorType() {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    return SnappyDecompressor.class;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  public String getDefaultExtension() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return ".snappy";<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  // Package private<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  static int getBufferSize(Configuration conf) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    return conf.getInt(SNAPPY_BUFFER_SIZE_KEY,<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      conf.getInt(CommonConfigurationKeys.IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_KEY,<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        CommonConfigurationKeys.IO_COMPRESSION_CODEC_SNAPPY_BUFFERSIZE_DEFAULT));<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>}<a name="line.144"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
index da165dc..ed10198 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.BlockBucket.html
@@ -42,1194 +42,1208 @@
 <span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import java.util.concurrent.atomic.LongAdder;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.conf.Configuration;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.util.StringUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * operations.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;/p&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * least-frequently-used element to the eviction algorithm.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * &lt;p/&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * chunk the others are able to grow beyond their chunk size.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * &lt;p/&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;p/&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * thread.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;p/&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * &lt;p/&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * sizes and usage.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>@InterfaceAudience.Private<a name="line.87"></a>
-<span class="sourceLineNo">088</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    "hbase.lru.blockcache.single.percentage";<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * is a cluster-wide configuration<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /* Default Configuration Parameters */<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  /* Backing Concurrent Map Configuration */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  /* Eviction thresholds */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /* Priority buckets */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /* Statistics thread */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#computeIfPresent<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * (key, func). Besides, the func method must execute exactly once only when the key is present<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * and under the lock context, otherwise the reference count will be messed up. Notice that the<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  /** Eviction lock (locked when eviction in process) */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.158"></a>
+<span class="sourceLineNo">037</span>import org.apache.commons.lang3.mutable.MutableBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.util.StringUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * operations.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;/p&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * least-frequently-used element to the eviction algorithm.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * &lt;p/&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * chunk the others are able to grow beyond their chunk size.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * &lt;p/&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p/&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * thread.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * &lt;p/&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * &lt;p/&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * sizes and usage.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>@InterfaceAudience.Private<a name="line.88"></a>
+<span class="sourceLineNo">089</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    "hbase.lru.blockcache.single.percentage";<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * is a cluster-wide configuration<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  /* Default Configuration Parameters */<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /* Backing Concurrent Map Configuration */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  /* Eviction thresholds */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /* Priority buckets */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  /* Statistics thread */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  /**<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#k (key, func).<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * Besides, the func method must execute exactly once only when the key is present and under the<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * lock context, otherwise the reference count will be messed up. Notice that the<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that. Some code using<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * #computeIfPresent also expects the supplier to be executed only once. ConcurrentHashMap can<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * guarantee that. Other types may not.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  private final long maxBlockSize;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  private volatile boolean evictionInProgress = false;<a name="line.163"></a>
+<span class="sourceLineNo">160</span>  /** Eviction lock (locked when eviction in process) */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private final long maxBlockSize;<a name="line.163"></a>
 <span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /** Eviction thread */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  private transient final EvictionThread evictionThread;<a name="line.166"></a>
+<span class="sourceLineNo">165</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  private volatile boolean evictionInProgress = false;<a name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /** Current size of cache */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private final AtomicLong size;<a name="line.174"></a>
+<span class="sourceLineNo">168</span>  /** Eviction thread */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private transient final EvictionThread evictionThread;<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.174"></a>
 <span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  /** Current size of data blocks */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.177"></a>
+<span class="sourceLineNo">176</span>  /** Current size of cache */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  private final AtomicLong size;<a name="line.177"></a>
 <span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  /** Current size of index blocks */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.180"></a>
+<span class="sourceLineNo">179</span>  /** Current size of data blocks */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.180"></a>
 <span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /** Current size of bloom blocks */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.183"></a>
+<span class="sourceLineNo">182</span>  /** Current size of index blocks */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.183"></a>
 <span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  /** Current number of cached elements */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private final AtomicLong elements;<a name="line.186"></a>
+<span class="sourceLineNo">185</span>  /** Current size of bloom blocks */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  /** Current number of cached data block elements */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.189"></a>
+<span class="sourceLineNo">188</span>  /** Current number of cached elements */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  private final AtomicLong elements;<a name="line.189"></a>
 <span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /** Current number of cached index block elements */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.192"></a>
+<span class="sourceLineNo">191</span>  /** Current number of cached data block elements */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.192"></a>
 <span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  /** Current number of cached bloom block elements */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.195"></a>
+<span class="sourceLineNo">194</span>  /** Current number of cached index block elements */<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.195"></a>
 <span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /** Cache access count (sequential ID) */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private final AtomicLong count;<a name="line.198"></a>
+<span class="sourceLineNo">197</span>  /** Current number of cached bloom block elements */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /** hard capacity limit */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  private float hardCapacityLimitFactor;<a name="line.201"></a>
+<span class="sourceLineNo">200</span>  /** Cache access count (sequential ID) */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  private final AtomicLong count;<a name="line.201"></a>
 <span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  /** Cache statistics */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  private final CacheStats stats;<a name="line.204"></a>
+<span class="sourceLineNo">203</span>  /** hard capacity limit */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private float hardCapacityLimitFactor;<a name="line.204"></a>
 <span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  private long maxSize;<a name="line.207"></a>
+<span class="sourceLineNo">206</span>  /** Cache statistics */<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  private final CacheStats stats;<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /** Approximate block size */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  private long blockSize;<a name="line.210"></a>
+<span class="sourceLineNo">209</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  private long maxSize;<a name="line.210"></a>
 <span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  private float acceptableFactor;<a name="line.213"></a>
+<span class="sourceLineNo">212</span>  /** Approximate block size */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  private long blockSize;<a name="line.213"></a>
 <span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  private float minFactor;<a name="line.216"></a>
+<span class="sourceLineNo">215</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  private float acceptableFactor;<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  /** Single access bucket size */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  private float singleFactor;<a name="line.219"></a>
+<span class="sourceLineNo">218</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  private float minFactor;<a name="line.219"></a>
 <span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /** Multiple access bucket size */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private float multiFactor;<a name="line.222"></a>
+<span class="sourceLineNo">221</span>  /** Single access bucket size */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  private float singleFactor;<a name="line.222"></a>
 <span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>  /** In-memory bucket size */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  private float memoryFactor;<a name="line.225"></a>
+<span class="sourceLineNo">224</span>  /** Multiple access bucket size */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  private float multiFactor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** Overhead of the structure itself */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  private long overhead;<a name="line.228"></a>
+<span class="sourceLineNo">227</span>  /** In-memory bucket size */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private float memoryFactor;<a name="line.228"></a>
 <span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  private boolean forceInMemory;<a name="line.231"></a>
+<span class="sourceLineNo">230</span>  /** Overhead of the structure itself */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private long overhead;<a name="line.231"></a>
 <span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  private transient BlockCache victimHandler = null;<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * fine).<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param blockSize approximate size of each block, in bytes<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    this(maxSize, blockSize, true);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    this(maxSize, blockSize, true, conf);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    this.maxBlockSize = maxBlockSize;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    if (<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        || memoryFactor &lt; 0<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    ) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      throw new IllegalArgumentException(<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.305"></a>
+<span class="sourceLineNo">233</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  private boolean forceInMemory;<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>  /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  private transient BlockCache victimHandler = null;<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * fine).<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * &lt;p&gt;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param blockSize approximate size of each block, in bytes<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    this(maxSize, blockSize, true);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    this(maxSize, blockSize, true, conf);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    this.maxBlockSize = maxBlockSize;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    if (<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        || memoryFactor &lt; 0<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    ) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      throw new IllegalArgumentException(<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.305"></a>
 <span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.308"></a>
+<span class="sourceLineNo">307</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    this.maxSize = maxSize;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    this.blockSize = blockSize;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    this.forceInMemory = forceInMemory;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    this.minFactor = minFactor;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    this.acceptableFactor = acceptableFactor;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    this.singleFactor = singleFactor;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    this.multiFactor = multiFactor;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    this.memoryFactor = memoryFactor;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    this.count = new AtomicLong(0);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    this.elements = new AtomicLong(0);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    this.size = new AtomicLong(this.overhead);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    if (evictionThread) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      this.evictionThread = new EvictionThread(this);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      this.evictionThread = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    // every five minutes.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    if (victimHandler != null) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    victimHandler = requireNonNull(victimCache);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  public void setMaxSize(long maxSize) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.maxSize = maxSize;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      runEviction();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>  /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * JVM, so need a retain here.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @param buf the original block<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * @return an block with an heap memory backend.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    if (buf instanceof HFileBlock) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      if (blk.isSharedMem()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return buf.retain();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  // BlockCache implementation<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Cache the block with the specified name and buffer.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   * &lt;p&gt;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * this can happen, for which we compare the buffer contents.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param cacheKey block's cache key<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @param buf      block buffer<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param inMemory if block is in-memory<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   */<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  @Override<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      // If there are a lot of blocks that are too<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      // big this can make the logs way too noisy.<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      // So we log 2%<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (stats.failInsert() % 50 == 0) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          + maxBlockSize);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      return;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    long currentSize = size.get();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    long currentAcceptableSize = acceptableSize();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      stats.failInsert();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (LOG.isTraceEnabled()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      if (!evictionInProgress) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        runEviction();<a name="line.420"></a>
+<span class="sourceLineNo">310</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    this.maxSize = maxSize;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    this.blockSize = blockSize;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    this.forceInMemory = forceInMemory;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    this.minFactor = minFactor;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    this.acceptableFactor = acceptableFactor;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    this.singleFactor = singleFactor;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    this.multiFactor = multiFactor;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    this.memoryFactor = memoryFactor;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    this.count = new AtomicLong(0);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    this.elements = new AtomicLong(0);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    this.size = new AtomicLong(this.overhead);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    if (evictionThread) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      this.evictionThread = new EvictionThread(this);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.evictionThread = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    // every five minutes.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (victimHandler != null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    victimHandler = requireNonNull(victimCache);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void setMaxSize(long maxSize) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.maxSize = maxSize;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      runEviction();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>  /**<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   * JVM, so need a retain here.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   * @param buf the original block<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * @return an block with an heap memory backend.<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   */<a name="line.370"></a>
+<span class="sourceLineNo">371</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (buf instanceof HFileBlock) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      if (blk.isSharedMem()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    return buf.retain();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>  // BlockCache implementation<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Cache the block with the specified name and buffer.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * &lt;p&gt;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * this can happen, for which we compare the buffer contents.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param cacheKey block's cache key<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param buf      block buffer<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param inMemory if block is in-memory<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  @Override<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      // If there are a lot of blocks that are too<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // big this can make the logs way too noisy.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      // So we log 2%<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      if (stats.failInsert() % 50 == 0) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          + maxBlockSize);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      return;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    long currentSize = size.get();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    long currentAcceptableSize = acceptableSize();<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      stats.failInsert();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      if (LOG.isTraceEnabled()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.420"></a>
 <span class="sourceLineNo">421</span>      }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      return;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // Ensure that the block is an heap one.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    buf = asReferencedHeapBlock(buf);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    map.put(cacheKey, cb);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    long val = elements.incrementAndGet();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (buf.getBlockType().isBloom()) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      bloomBlockElements.increment();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      indexBlockElements.increment();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    } else if (buf.getBlockType().isData()) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      dataBlockElements.increment();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    if (LOG.isTraceEnabled()) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      long size = map.size();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      assertCounterSanity(size, val);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      runEviction();<a name="line.442"></a>
+<span class="sourceLineNo">422</span>      if (!evictionInProgress) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        runEviction();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    // Ensure that the block is an heap one.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    buf = asReferencedHeapBlock(buf);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    map.put(cacheKey, cb);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    long val = elements.incrementAndGet();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    if (buf.getBlockType().isBloom()) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      bloomBlockElements.increment();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      indexBlockElements.increment();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    } else if (buf.getBlockType().isData()) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      dataBlockElements.increment();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    if (LOG.isTraceEnabled()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      long size = map.size();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      assertCounterSanity(size, val);<a name="line.442"></a>
 <span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>  /**<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * use with TRACE level logging and -ea JVM.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    if (counterVal &lt; 0) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        + ", mapSize=" + mapSize);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (pct_diff &gt; 0.05) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.459"></a>
-<span class="sourceLineNo">460</span>          + ", mapSize=" + mapSize);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>  /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * Cache the block with the specified name and buffer.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   * &lt;p&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   * otherwise the caching size is based on off-heap.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * @param cacheKey block's cache key<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * @param buf      block buffer<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    cacheBlock(cacheKey, buf, false);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   */<a name="line.483"></a>
-<span class="sourceLineNo">484</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    long heapsize = cb.heapSize();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (evict) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      heapsize *= -1;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    if (bt != null) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (bt.isBloom()) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        bloomBlockSize.add(heapsize);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      } else if (bt.isIndex()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        indexBlockSize.add(heapsize);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      } else if (bt.isData()) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        dataBlockSize.add(heapsize);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    return size.addAndGet(heapsize);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * Get the buffer of the block with the specified name.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * @param cacheKey           block's cache key<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   *                           double counting cache misses when doing double-check locking)<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    boolean updateCacheMetrics) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      // see HBASE-22422.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      val.getBuffer().retain();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      return val;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    });<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    if (cb == null) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      // If there is another block cache then try and read there.<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      // However if this is a retry ( second time in double checked locking )<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        // Promote this to L1.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        if (result != null) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>          if (caching) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>          }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return result;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      }<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return null;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    if (updateCacheMetrics) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    cb.access(count.incrementAndGet());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    return cb.getBuffer();<a name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * Whether the cache contains block with specified cacheKey<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * @return true if contains the block<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  @Override<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    return map.containsKey(cacheKey);<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  @Override<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>  }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>  /**<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   * log-access-time map.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   * &lt;p&gt;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.569"></a>
-<span class="sourceLineNo">570</span>   * @return the number of blocks evicted<a name="line.570"></a>
-<span class="sourceLineNo">571</span>   */<a name="line.571"></a>
-<span class="sourceLineNo">572</span>  @Override<a name="line.572"></a>
-<span class="sourceLineNo">573</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    int numEvicted = 0;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        if (evictBlock(key)) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          ++numEvicted;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    if (victimHandler != null) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    return numEvicted;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * read again later<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @return the heap size of evicted block<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   */<a name="line.593"></a>
-<span class="sourceLineNo">594</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    LruCachedBlock previous = map.remove(block.getCacheKey());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    if (previous == null) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return 0;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    updateSizeMetrics(block, true);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    long val = elements.decrementAndGet();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    if (LOG.isTraceEnabled()) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      long size = map.size();<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      assertCounterSanity(size, val);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    if (bt.isBloom()) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      bloomBlockElements.decrement();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    } else if (bt.isIndex()) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      indexBlockElements.decrement();<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    } else if (bt.isData()) {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      dataBlockElements.decrement();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    if (evictedByEvictionProcess) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      // update the stats counter.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      if (victimHandler != null) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        victimHandler.cacheBlock(block.getCacheKey(), block.getBuffer());<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    // NOT move this up because if do that then the victimHandler may access the buffer with<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    // refCnt = 0 which is disallowed.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    previous.getBuffer().release();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    return block.heapSize();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>  /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   * Multi-threaded call to run the eviction process.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   */<a name="line.630"></a>
-<span class="sourceLineNo">631</span>  private void runEviction() {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      evict();<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    } else {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      evictionThread.evict();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>  }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>  boolean isEvictionInProgress() {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    return evictionInProgress;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>  long getOverhead() {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    return overhead;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>  /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   * Eviction method.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>   */<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  void evict() {<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>    // Ensure only one eviction at a time<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    if (!evictionLock.tryLock()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    }<a name="line.655"></a>
+<span class="sourceLineNo">444</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      runEviction();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * use with TRACE level logging and -ea JVM.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (counterVal &lt; 0) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        + ", mapSize=" + mapSize);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      if (pct_diff &gt; 0.05) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          + ", mapSize=" + mapSize);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   * Cache the block with the specified name and buffer.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   * &lt;p&gt;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   * otherwise the caching size is based on off-heap.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>   * @param cacheKey block's cache key<a name="line.475"></a>
+<span class="sourceLineNo">476</span>   * @param buf      block buffer<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   */<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  @Override<a name="line.478"></a>
+<span class="sourceLineNo">479</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    cacheBlock(cacheKey, buf, false);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
+<span class="sourceLineNo">484</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
+<span class="sourceLineNo">487</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    long heapsize = cb.heapSize();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    if (evict) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      heapsize *= -1;<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    if (bt != null) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (bt.isBloom()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        bloomBlockSize.add(heapsize);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      } else if (bt.isIndex()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        indexBlockSize.add(heapsize);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      } else if (bt.isData()) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>        dataBlockSize.add(heapsize);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    return size.addAndGet(heapsize);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>  /**<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   * Get the buffer of the block with the specified name.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   * @param cacheKey           block's cache key<a name="line.507"></a>
+<span class="sourceLineNo">508</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   *                           double counting cache misses when doing double-check locking)<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  @Override<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    boolean updateCacheMetrics) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      // see HBASE-22422.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      val.getBuffer().retain();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      return val;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    });<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    if (cb == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      // If there is another block cache then try and read there.<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      // However if this is a retry ( second time in double checked locking )<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        // Promote this to L1.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        if (result != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          if (caching) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        return result;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return null;<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    if (updateCacheMetrics) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    cb.access(count.incrementAndGet());<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    return cb.getBuffer();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>  }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>  /**<a name="line.553"></a>
+<span class="sourceLineNo">554</span>   * Whether the cache contains block with specified cacheKey<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * @return true if contains the block<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   */<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  @Override<a name="line.557"></a>
+<span class="sourceLineNo">558</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    return map.containsKey(cacheKey);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>  @Override<a name="line.562"></a>
+<span class="sourceLineNo">563</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>  }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>  /**<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   * log-access-time map.<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * &lt;p&gt;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   * @return the number of blocks evicted<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   */<a name="line.575"></a>
+<span class="sourceLineNo">576</span>  @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    int numEvicted = 0;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        if (evictBlock(key)) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          ++numEvicted;<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    if (victimHandler != null) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    return numEvicted;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * read again later<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @return the heap size of evicted block<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   */<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    final MutableBoolean evicted = new MutableBoolean(false);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    map.computeIfPresent(block.getCacheKey(), (k, v) -&gt; {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      // Run the victim handler before we remove the mapping in the L1 map. It must complete<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      // quickly because other removal or insertion operations can be blocked in the meantime.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (evictedByEvictionProcess &amp;&amp; victimHandler != null) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        victimHandler.cacheBlock(k, v.getBuffer());<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      // NOT move this up because if we do that then the victimHandler may access the buffer with<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      // refCnt = 0 which is disallowed.<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      v.getBuffer().release();<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      evicted.setTrue();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      // By returning null from the supplier we remove the mapping from the L1 map.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      return null;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    });<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    // If we didn't find anything to evict there is nothing more to do here.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    if (evicted.isFalse()) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return 0;<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    }<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    // We evicted the block so update L1 statistics.<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    updateSizeMetrics(block, true);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    long val = elements.decrementAndGet();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    if (LOG.isTraceEnabled()) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      long size = map.size();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      assertCounterSanity(size, val);<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    }<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (bt.isBloom()) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      bloomBlockElements.decrement();<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    } else if (bt.isIndex()) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      indexBlockElements.decrement();<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    } else if (bt.isData()) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      dataBlockElements.decrement();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    if (evictedByEvictionProcess) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      // update the stats counter.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    return block.heapSize();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
+<span class="sourceLineNo">643</span>   * Multi-threaded call to run the eviction process.<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
+<span class="sourceLineNo">645</span>  private void runEviction() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      evict();<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      evictionThread.evict();<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>  boolean isEvictionInProgress() {<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    return evictionInProgress;<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
 <span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    try {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      evictionInProgress = true;<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      long currentSize = this.size.get();<a name="line.659"></a>
-<span class="sourceLineNo">660</span>      long bytesToFree = currentSize - minSize();<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span>      if (LOG.isTraceEnabled()) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span>      if (bytesToFree &lt;= 0) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        return;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      }<a name="line.669"></a>
+<span class="sourceLineNo">657</span>  long getOverhead() {<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    return overhead;<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span>  /**<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * Eviction method.<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   */<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  void evict() {<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>    // Ensure only one eviction at a time<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    if (!evictionLock.tryLock()) {<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      return;<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
 <span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>      // Instantiate priority buckets<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.674"></a>
+<span class="sourceLineNo">671</span>    try {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      evictionInProgress = true;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      long currentSize = this.size.get();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      long bytesToFree = currentSize - minSize();<a name="line.674"></a>
 <span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>      // Scan entire map putting into appropriate buckets<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        switch (cachedBlock.getPriority()) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>          case SINGLE: {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>            bucketSingle.add(cachedBlock);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>            break;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>          }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>          case MULTI: {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>            bucketMulti.add(cachedBlock);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>            break;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>          }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>          case MEMORY: {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>            bucketMemory.add(cachedBlock);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            break;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>          }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>      long bytesFreed = 0;<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        long s = bucketSingle.totalSize();<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        long m = bucketMulti.totalSize();<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        if (bytesToFree &gt; (s + m)) {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.699"></a>
-<span class="sourceLineNo">700</span>          // so the single and multi buckets will be emptied<a name="line.700"></a>
-<span class="sourceLineNo">701</span>          bytesFreed = bucketSingle.free(s);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>          bytesFreed += bucketMulti.free(m);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>          if (LOG.isTraceEnabled()) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>            LOG.trace(<a name="line.704"></a>
-<span class="sourceLineNo">705</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.705"></a>
-<span class="sourceLineNo">706</span>          }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>          if (LOG.isTraceEnabled()) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            LOG.trace(<a name="line.709"></a>
-<span class="sourceLineNo">710</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        } else {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>          // this means no need to evict block in memory bucket,<a name="line.713"></a>
-<span class="sourceLineNo">714</span>          // and we try best to make the ratio between single-bucket and<a name="line.714"></a>
-<span class="sourceLineNo">715</span>          // multi-bucket is 1:2<a name="line.715"></a>
-<span class="sourceLineNo">716</span>          long bytesRemain = s + m - bytesToFree;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>          if (3 * s &lt;= bytesRemain) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            // single-bucket is small enough that no eviction happens for it<a name="line.718"></a>
-<span class="sourceLineNo">719</span>            // hence all eviction goes from multi-bucket<a name="line.719"></a>
-<span class="sourceLineNo">720</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            // hence all eviction goes from single-bucket<a name="line.723"></a>
-<span class="sourceLineNo">724</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>          } else {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>            // both buckets need to evict some blocks<a name="line.726"></a>
-<span class="sourceLineNo">727</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>            }<a name="line.730"></a>
-<span class="sourceLineNo">731</span>          }<a name="line.731"></a>
-<span class="sourceLineNo">732</span>        }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>        bucketQueue.add(bucketSingle);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        bucketQueue.add(bucketMulti);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        bucketQueue.add(bucketMemory);<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>        int remainingBuckets = bucketQueue.size();<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>        BlockBucket bucket;<a name="line.742"></a>
-<span class="sourceLineNo">743</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>          long overflow = bucket.overflow();<a name="line.744"></a>
-<span class="sourceLineNo">745</span>          if (overflow &gt; 0) {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>            long bucketBytesToFree =<a name="line.746"></a>
-<span class="sourceLineNo">747</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>          remainingBuckets--;<a name="line.750"></a>
-<span class="sourceLineNo">751</span>        }<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      }<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (LOG.isTraceEnabled()) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        long single = bucketSingle.totalSize();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        long multi = bucketMulti.totalSize();<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        long memory = bucketMemory.totalSize();<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        LOG.trace(<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.758"></a>
-<span class="sourceLineNo">759</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.759"></a>
-<span class="sourceLineNo">760</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.760"></a>
-<span class="sourceLineNo">761</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    } finally {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      stats.evict();<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      evictionInProgress = false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      evictionLock.unlock();<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>  }<a name="line.768"></a>
-<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span>  @Override<a name="line.770"></a>
-<span class="sourceLineNo">771</span>  public String toString() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.772"></a>
-<span class="sourceLineNo">773</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.774"></a>
-<span class="sourceLineNo">775</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      .toString();<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span>  /**<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.788"></a>
-<span class="sourceLineNo">789</span><a name="line.789"></a>
-<span class="sourceLineNo">790</span>    private final String name;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    private LruCachedBlockQueue queue;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    private long totalSize = 0;<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    private long bucketSize;<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      this.name = name;<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      this.bucketSize = bucketSize;<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      totalSize = 0;<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    }<a name="line.800"></a>
-<span class="sourceLineNo">801</span><a name="line.801"></a>
-<span class="sourceLineNo">802</span>    public void add(LruCachedBlock block) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      totalSize += block.heapSize();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      queue.add(block);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    public long free(long toFree) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (LOG.isTraceEnabled()) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      LruCachedBlock cb;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      long freedBytes = 0;<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      while ((cb = queue.pollLast()) != null) {<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        freedBytes += evictBlock(cb, true);<a name="line.814"></a>
-<span class="sourceLineNo">815</span>        if (freedBytes &gt;= toFree) {<a name="line.815"></a>
-<span class="sourceLineNo">816</span>          return freedBytes;<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        }<a name="line.817"></a>
-<span class="sourceLineNo">818</span>      }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      if (LOG.isTraceEnabled()) {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      }<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      return freedBytes;<a name="line.822"></a>
-<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span>    public long overflow() {<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      return totalSize - bucketSize;<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>    public long totalSize() {<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      return totalSize;<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span>    @Override<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    public int compareTo(BlockBucket that) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>    @Override<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    public boolean equals(Object that) {<a name="line.839"></a>
-<span class="sourceLineNo">840</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span>        return false;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>      }<a name="line.842"></a>
-<span class="sourceLineNo">843</span>      return compareTo((BlockBucket) that) == 0;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    }<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    @Override<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    public int hashCode() {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    }<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    @Override<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    public String toString() {<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.853"></a>
-<span class="sourceLineNo">854</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.854"></a>
-<span class="sourceLineNo">855</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    }<a name="line.856"></a>
-<span class="sourceLineNo">857</span>  }<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>  /**<a name="line.859"></a>
-<span class="sourceLineNo">860</span>   * Get the maximum size of this cache.<a name="line.860"></a>
-<span class="sourceLineNo">861</span>   * @return max size in bytes<a name="line.861"></a>
-<span class="sourceLineNo">862</span>   */<a name="line.862"></a>
-<span class="sourceLineNo">863</span><a name="line.863"></a>
-<span class="sourceLineNo">864</span>  @Override<a name="line.864"></a>
-<span class="sourceLineNo">865</span>  public long getMaxSize() {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    return this.maxSize;<a name="line.866"></a>
-<span class="sourceLineNo">867</span>  }<a name="line.867"></a>
-<span class="sourceLineNo">868</span><a name="line.868"></a>
-<span class="sourceLineNo">869</span>  @Override<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  public long getCurrentSize() {<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    return this.size.get();<a name="line.871"></a>
-<span class="sourceLineNo">872</span>  }<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>  @Override<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  public long getCurrentDataSize() {<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    return this.dataBlockSize.sum();<a name="line.876"></a>
-<span class="sourceLineNo">877</span>  }<a name="line.877"></a>
-<span class="sourceLineNo">878</span><a name="line.878"></a>
-<span class="sourceLineNo">879</span>  public long getCurrentIndexSize() {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    return this.indexBlockSize.sum();<a name="line.880"></a>
+<span class="sourceLineNo">676</span>      if (LOG.isTraceEnabled()) {<a name="line.676"></a>
+<span class="sourceLineNo">677</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.677"></a>
+<span class="sourceLineNo">678</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      }<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>      if (bytesToFree &lt;= 0) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        return;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>      // Instantiate priority buckets<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.686"></a>
+<span class="sourceLineNo">687</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>      // Scan entire map putting into appropriate buckets<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>        switch (cachedBlock.getPriority()) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span>          case SINGLE: {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            bucketSingle.add(cachedBlock);<a name="line.694"></a>
+<span class="sourceLineNo">695</span>            break;<a name="line.695"></a>
+<span class="sourceLineNo">696</span>          }<a name="line.696"></a>
+<span class="sourceLineNo">697</span>          case MULTI: {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>            bucketMulti.add(cachedBlock);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>            break;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>          }<a name="line.700"></a>
+<span class="sourceLineNo">701</span>          case MEMORY: {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>            bucketMemory.add(cachedBlock);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>            break;<a name="line.703"></a>
+<span class="sourceLineNo">704</span>          }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>        }<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>      long bytesFreed = 0;<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        long s = bucketSingle.totalSize();<a name="line.710"></a>
+<span class="sourceLineNo">711</span>        long m = bucketMulti.totalSize();<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        if (bytesToFree &gt; (s + m)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.713"></a>
+<span class="sourceLineNo">714</span>          // so the single and multi buckets will be emptied<a name="line.714"></a>
+<span class="sourceLineNo">715</span>          bytesFreed = bucketSingle.free(s);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>          bytesFreed += bucketMulti.free(m);<a name="line.716"></a>
+<span class="sourceLineNo">717</span>          if (LOG.isTraceEnabled()) {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>            LOG.trace(<a name="line.718"></a>
+<span class="sourceLineNo">719</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.719"></a>
+<span class="sourceLineNo">720</span>          }<a name="line.720"></a>
+<span class="sourceLineNo">721</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.721"></a>
+<span class="sourceLineNo">722</span>          if (LOG.isTraceEnabled()) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>            LOG.trace(<a name="line.723"></a>
+<span class="sourceLineNo">724</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.724"></a>
+<span class="sourceLineNo">725</span>          }<a name="line.725"></a>
+<span class="sourceLineNo">726</span>        } else {<a name="line.726"></a>
+<span class="sourceLineNo">727</span>          // this means no need to evict block in memory bucket,<a name="line.727"></a>
+<span class="sourceLineNo">728</span>          // and we try best to make the ratio between single-bucket and<a name="line.728"></a>
+<span class="sourceLineNo">729</span>          // multi-bucket is 1:2<a name="line.729"></a>
+<span class="sourceLineNo">730</span>          long bytesRemain = s + m - bytesToFree;<a name="line.730"></a>
+<span class="sourceLineNo">731</span>          if (3 * s &lt;= bytesRemain) {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>            // single-bucket is small enough that no eviction happens for it<a name="line.732"></a>
+<span class="sourceLineNo">733</span>            // hence all eviction goes from multi-bucket<a name="line.733"></a>
+<span class="sourceLineNo">734</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.736"></a>
+<span class="sourceLineNo">737</span>            // hence all eviction goes from single-bucket<a name="line.737"></a>
+<span class="sourceLineNo">738</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.738"></a>
+<span class="sourceLineNo">739</span>          } else {<a name="line.739"></a>
+<span class="sourceLineNo">740</span>            // both buckets need to evict some blocks<a name="line.740"></a>
+<span class="sourceLineNo">741</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.742"></a>
+<span class="sourceLineNo">743</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>            }<a name="line.744"></a>
+<span class="sourceLineNo">745</span>          }<a name="line.745"></a>
+<span class="sourceLineNo">746</span>        }<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      } else {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span>        bucketQueue.add(bucketSingle);<a name="line.750"></a>
+<span class="sourceLineNo">751</span>        bucketQueue.add(bucketMulti);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>        bucketQueue.add(bucketMemory);<a name="line.752"></a>
+<span class="sourceLineNo">753</span><a name="line.753"></a>
+<span class="sourceLineNo">754</span>        int remainingBuckets = bucketQueue.size();<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>        BlockBucket bucket;<a name="line.756"></a>
+<span class="sourceLineNo">757</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.757"></a>
+<span class="sourceLineNo">758</span>          long overflow = bucket.overflow();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>          if (overflow &gt; 0) {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>            long bucketBytesToFree =<a name="line.760"></a>
+<span class="sourceLineNo">761</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.761"></a>
+<span class="sourceLineNo">762</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.762"></a>
+<span class="sourceLineNo">763</span>          }<a name="line.763"></a>
+<span class="sourceLineNo">764</span>          remainingBuckets--;<a name="line.764"></a>
+<span class="sourceLineNo">765</span>        }<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>      if (LOG.isTraceEnabled()) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        long single = bucketSingle.totalSize();<a name="line.768"></a>
+<span class="sourceLineNo">769</span>        long multi = bucketMulti.totalSize();<a name="line.769"></a>
+<span class="sourceLineNo">770</span>        long memory = bucketMemory.totalSize();<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        LOG.trace(<a name="line.771"></a>
+<span class="sourceLineNo">772</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.773"></a>
+<span class="sourceLineNo">774</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.775"></a>
+<span class="sourceLineNo">776</span>      }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    } finally {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      stats.evict();<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      evictionInProgress = false;<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      evictionLock.unlock();<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  @Override<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  public String toString() {<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      .toString();<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
+<span class="sourceLineNo">796</span><a name="line.796"></a>
+<span class="sourceLineNo">797</span>  /**<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   */<a name="line.801"></a>
+<span class="sourceLineNo">802</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span>    private final String name;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>    private LruCachedBlockQueue queue;<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    private long totalSize = 0;<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    private long bucketSize;<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      this.name = name;<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      this.bucketSize = bucketSize;<a name="line.811"></a>
+<span class="sourceLineNo">812</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      totalSize = 0;<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span><a name="line.815"></a>
+<span class="sourceLineNo">816</span>    public void add(LruCachedBlock block) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      totalSize += block.heapSize();<a name="line.817"></a>
+<span class="sourceLineNo">818</span>      queue.add(block);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    }<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>    public long free(long toFree) {<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      if (LOG.isTraceEnabled()) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      }<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      LruCachedBlock cb;<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      long freedBytes = 0;<a name="line.826"></a>
+<span class="sourceLineNo">827</span>      while ((cb = queue.pollLast()) != null) {<a name="line.827"></a>
+<span class="sourceLineNo">828</span>        freedBytes += evictBlock(cb, true);<a name="line.828"></a>
+<span class="sourceLineNo">829</span>        if (freedBytes &gt;= toFree) {<a name="line.829"></a>
+<span class="sourceLineNo">830</span>          return freedBytes;<a name="line.830"></a>
+<span class="sourceLineNo">831</span>        }<a name="line.831"></a>
+<span class="sourceLineNo">832</span>      }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>      if (LOG.isTraceEnabled()) {<a name="line.833"></a>
+<span class="sourceLineNo">834</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      }<a name="line.835"></a>
+<span class="sourceLineNo">836</span>      return freedBytes;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    }<a name="line.837"></a>
+<span class="sourceLineNo">838</span><a name="line.838"></a>
+<span class="sourceLineNo">839</span>    public long overflow() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      return totalSize - bucketSize;<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    }<a name="line.841"></a>
+<span class="sourceLineNo">842</span><a name="line.842"></a>
+<span class="sourceLineNo">843</span>    public long totalSize() {<a name="line.843"></a>
+<span class="sourceLineNo">844</span>      return totalSize;<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    }<a name="line.845"></a>
+<span class="sourceLineNo">846</span><a name="line.846"></a>
+<span class="sourceLineNo">847</span>    @Override<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    public int compareTo(BlockBucket that) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    }<a name="line.850"></a>
+<span class="sourceLineNo">851</span><a name="line.851"></a>
+<span class="sourceLineNo">852</span>    @Override<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    public boolean equals(Object that) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>        return false;<a name="line.855"></a>
+<span class="sourceLineNo">856</span>      }<a name="line.856"></a>
+<span class="sourceLineNo">857</span>      return compareTo((BlockBucket) that) == 0;<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    }<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span>    @Override<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    public int hashCode() {<a name="line.861"></a>
+<span class="sourceLineNo">862</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    }<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>    @Override<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    public String toString() {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.867"></a>
+<span class="sourceLineNo">868</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.868"></a>
+<span class="sourceLineNo">869</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.869"></a>
+<span class="sourceLineNo">870</span>    }<a name="line.870"></a>
+<span class="sourceLineNo">871</span>  }<a name="line.871"></a>
+<span class="sourceLineNo">872</span><a name="line.872"></a>
+<span class="sourceLineNo">873</span>  /**<a name="line.873"></a>
+<span class="sourceLineNo">874</span>   * Get the maximum size of this cache.<a name="line.874"></a>
+<span class="sourceLineNo">875</span>   * @return max size in bytes<a name="line.875"></a>
+<span class="sourceLineNo">876</span>   */<a name="line.876"></a>
+<span class="sourceLineNo">877</span><a name="line.877"></a>
+<span class="sourceLineNo">878</span>  @Override<a name="line.878"></a>
+<span class="sourceLineNo">879</span>  public long getMaxSize() {<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    return this.maxSize;<a name="line.880"></a>
 <span class="sourceLineNo">881</span>  }<a name="line.881"></a>
 <span class="sourceLineNo">882</span><a name="line.882"></a>
-<span class="sourceLineNo">883</span>  public long getCurrentBloomSize() {<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    return this.bloomBlockSize.sum();<a name="line.884"></a>
-<span class="sourceLineNo">885</span>  }<a name="line.885"></a>
-<span class="sourceLineNo">886</span><a name="line.886"></a>
-<span class="sourceLineNo">887</span>  @Override<a name="line.887"></a>
-<span class="sourceLineNo">888</span>  public long getFreeSize() {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    return getMaxSize() - getCurrentSize();<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  }<a name="line.890"></a>
-<span class="sourceLineNo">891</span><a name="line.891"></a>
-<span class="sourceLineNo">892</span>  @Override<a name="line.892"></a>
-<span class="sourceLineNo">893</span>  public long size() {<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    return getMaxSize();<a name="line.894"></a>
+<span class="sourceLineNo">883</span>  @Override<a name="line.883"></a>
+<span class="sourceLineNo">884</span>  public long getCurrentSize() {<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    return this.size.get();<a name="line.885"></a>
+<span class="sourceLineNo">886</span>  }<a name="line.886"></a>
+<span class="sourceLineNo">887</span><a name="line.887"></a>
+<span class="sourceLineNo">888</span>  @Override<a name="line.888"></a>
+<span class="sourceLineNo">889</span>  public long getCurrentDataSize() {<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    return this.dataBlockSize.sum();<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  public long getCurrentIndexSize() {<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    return this.indexBlockSize.sum();<a name="line.894"></a>
 <span class="sourceLineNo">895</span>  }<a name="line.895"></a>
 <span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  @Override<a name="line.897"></a>
-<span class="sourceLineNo">898</span>  public long getBlockCount() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    return this.elements.get();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>  }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>  @Override<a name="line.902"></a>
-<span class="sourceLineNo">903</span>  public long getDataBlockCount() {<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    return this.dataBlockElements.sum();<a name="line.904"></a>
-<span class="sourceLineNo">905</span>  }<a name="line.905"></a>
-<span class="sourceLineNo">906</span><a name="line.906"></a>
-<span class="sourceLineNo">907</span>  public long getIndexBlockCount() {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    return this.indexBlockElements.sum();<a name="line.908"></a>
+<span class="sourceLineNo">897</span>  public long getCurrentBloomSize() {<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    return this.bloomBlockSize.sum();<a name="line.898"></a>
+<span class="sourceLineNo">899</span>  }<a name="line.899"></a>
+<span class="sourceLineNo">900</span><a name="line.900"></a>
+<span class="sourceLineNo">901</span>  @Override<a name="line.901"></a>
+<span class="sourceLineNo">902</span>  public long getFreeSize() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    return getMaxSize() - getCurrentSize();<a name="line.903"></a>
+<span class="sourceLineNo">904</span>  }<a name="line.904"></a>
+<span class="sourceLineNo">905</span><a name="line.905"></a>
+<span class="sourceLineNo">906</span>  @Override<a name="line.906"></a>
+<span class="sourceLineNo">907</span>  public long size() {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    return getMaxSize();<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  public long getBloomBlockCount() {<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    return this.bloomBlockElements.sum();<a name="line.912"></a>
-<span class="sourceLineNo">913</span>  }<a name="line.913"></a>
-<span class="sourceLineNo">914</span><a name="line.914"></a>
-<span class="sourceLineNo">915</span>  EvictionThread getEvictionThread() {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    return this.evictionThread;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>  }<a name="line.917"></a>
-<span class="sourceLineNo">918</span><a name="line.918"></a>
-<span class="sourceLineNo">919</span>  /*<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.920"></a>
-<span class="sourceLineNo">921</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.921"></a>
-<span class="sourceLineNo">922</span>   * LruBlockCache#runEviction()}<a name="line.922"></a>
-<span class="sourceLineNo">923</span>   */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  static class EvictionThread extends Thread {<a name="line.924"></a>
-<span class="sourceLineNo">925</span><a name="line.925"></a>
-<span class="sourceLineNo">926</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    private volatile boolean go = true;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    // flag set after enter the run method, used for test<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    private boolean enteringRun = false;<a name="line.929"></a>
-<span class="sourceLineNo">930</span><a name="line.930"></a>
-<span class="sourceLineNo">931</span>    public EvictionThread(LruBlockCache cache) {<a name="line.931"></a>
-<span class="sourceLineNo">932</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      setDaemon(true);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    }<a name="line.935"></a>
-<span class="sourceLineNo">936</span><a name="line.936"></a>
-<span class="sourceLineNo">937</span>    @Override<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    public void run() {<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      enteringRun = true;<a name="line.939"></a>
-<span class="sourceLineNo">940</span>      while (this.go) {<a name="line.940"></a>
-<span class="sourceLineNo">941</span>        synchronized (this) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>          try {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>          } catch (InterruptedException e) {<a name="line.944"></a>
-<span class="sourceLineNo">945</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.945"></a>
-<span class="sourceLineNo">946</span>            Thread.currentThread().interrupt();<a name="line.946"></a>
-<span class="sourceLineNo">947</span>          }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>        }<a name="line.948"></a>
-<span class="sourceLineNo">949</span>        LruBlockCache cache = this.cache.get();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        if (cache == null) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>          this.go = false;<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          break;<a name="line.952"></a>
-<span class="sourceLineNo">953</span>        }<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        cache.evict();<a name="line.954"></a>
-<span class="sourceLineNo">955</span>      }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    }<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.958"></a>
-<span class="sourceLineNo">959</span>        justification = "This is what we want")<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    public void evict() {<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      synchronized (this) {<a name="line.961"></a>
-<span class="sourceLineNo">962</span>        this.notifyAll();<a name="line.962"></a>
-<span class="sourceLineNo">963</span>      }<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    }<a name="line.964"></a>
-<span class="sourceLineNo">965</span><a name="line.965"></a>
-<span class="sourceLineNo">966</span>    synchronized void shutdown() {<a name="line.966"></a>
-<span class="sourceLineNo">967</span>      this.go = false;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>      this.notifyAll();<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    }<a name="line.969"></a>
-<span class="sourceLineNo">970</span><a name="line.970"></a>
-<span class="sourceLineNo">971</span>    public boolean isGo() {<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      return go;<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    }<a name="line.973"></a>
-<span class="sourceLineNo">974</span><a name="line.974"></a>
-<span class="sourceLineNo">975</span>    /**<a name="line.975"></a>
-<span class="sourceLineNo">976</span>     * Used for the test.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>     */<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    boolean isEnteringRun() {<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      return this.enteringRun;<a name="line.979"></a>
-<span class="sourceLineNo">980</span>    }<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  }<a name="line.981"></a>
-<span class="sourceLineNo">982</span><a name="line.982"></a>
-<span class="sourceLineNo">983</span>  /*<a name="line.983"></a>
-<span class="sourceLineNo">984</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.984"></a>
-<span class="sourceLineNo">985</span>   */<a name="line.985"></a>
-<span class="sourceLineNo">986</span>  static class StatisticsThread extends Thread {<a name="line.986"></a>
-<span class="sourceLineNo">987</span><a name="line.987"></a>
-<span class="sourceLineNo">988</span>    private final LruBlockCache lru;<a name="line.988"></a>
-<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      super("LruBlockCacheStats");<a name="line.991"></a>
-<span class="sourceLineNo">992</span>      setDaemon(true);<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      this.lru = lru;<a name="line.993"></a>
+<span class="sourceLineNo">911</span>  @Override<a name="line.911"></a>
+<span class="sourceLineNo">912</span>  public long getBlockCount() {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    return this.elements.get();<a name="line.913"></a>
+<span class="sourceLineNo">914</span>  }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>  @Override<a name="line.916"></a>
+<span class="sourceLineNo">917</span>  public long getDataBlockCount() {<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    return this.dataBlockElements.sum();<a name="line.918"></a>
+<span class="sourceLineNo">919</span>  }<a name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>  public long getIndexBlockCount() {<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    return this.indexBlockElements.sum();<a name="line.922"></a>
+<span class="sourceLineNo">923</span>  }<a name="line.923"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span>  public long getBloomBlockCount() {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    return this.bloomBlockElements.sum();<a name="line.926"></a>
+<span class="sourceLineNo">927</span>  }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>  EvictionThread getEvictionThread() {<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    return this.evictionThread;<a name="line.930"></a>
+<span class="sourceLineNo">931</span>  }<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>  /*<a name="line.933"></a>
+<span class="sourceLineNo">934</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   * LruBlockCache#runEviction()}<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   */<a name="line.937"></a>
+<span class="sourceLineNo">938</span>  static class EvictionThread extends Thread {<a name="line.938"></a>
+<span class="sourceLineNo">939</span><a name="line.939"></a>
+<span class="sourceLineNo">940</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    private volatile boolean go = true;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // flag set after enter the run method, used for test<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    private boolean enteringRun = false;<a name="line.943"></a>
+<span class="sourceLineNo">944</span><a name="line.944"></a>
+<span class="sourceLineNo">945</span>    public EvictionThread(LruBlockCache cache) {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      setDaemon(true);<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    }<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>    @Override<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    public void run() {<a name="line.952"></a>
+<span class="sourceLineNo">953</span>      enteringRun = true;<a name="line.953"></a>
+<span class="sourceLineNo">954</span>      while (this.go) {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>        synchronized (this) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>          try {<a name="line.956"></a>
+<span class="sourceLineNo">957</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.957"></a>
+<span class="sourceLineNo">958</span>          } catch (InterruptedException e) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.959"></a>
+<span class="sourceLineNo">960</span>            Thread.currentThread().interrupt();<a name="line.960"></a>
+<span class="sourceLineNo">961</span>          }<a name="line.961"></a>
+<span class="sourceLineNo">962</span>        }<a name="line.962"></a>
+<span class="sourceLineNo">963</span>        LruBlockCache cache = this.cache.get();<a name="line.963"></a>
+<span class="sourceLineNo">964</span>        if (cache == null) {<a name="line.964"></a>
+<span class="sourceLineNo">965</span>          this.go = false;<a name="line.965"></a>
+<span class="sourceLineNo">966</span>          break;<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        }<a name="line.967"></a>
+<span class="sourceLineNo">968</span>        cache.evict();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      }<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        justification = "This is what we want")<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    public void evict() {<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      synchronized (this) {<a name="line.975"></a>
+<span class="sourceLineNo">976</span>        this.notifyAll();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      }<a name="line.977"></a>
+<span class="sourceLineNo">978</span>    }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>    synchronized void shutdown() {<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      this.go = false;<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      this.notifyAll();<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    public boolean isGo() {<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      return go;<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span><a name="line.988"></a>
+<span class="sourceLineNo">989</span>    /**<a name="line.989"></a>
+<span class="sourceLineNo">990</span>     * Used for the test.<a name="line.990"></a>
+<span class="sourceLineNo">991</span>     */<a name="line.991"></a>
+<span class="sourceLineNo">992</span>    boolean isEnteringRun() {<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      return this.enteringRun;<a name="line.993"></a>
 <span class="sourceLineNo">994</span>    }<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>    @Override<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    public void run() {<a name="line.997"></a>
-<span class="sourceLineNo">998</span>      lru.logStats();<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    }<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>  }<a name="line.1000"></a>
+<span class="sourceLineNo">995</span>  }<a name="line.995"></a>
+<span class="sourceLineNo">996</span><a name="line.996"></a>
+<span class="sourceLineNo">997</span>  /*<a name="line.997"></a>
+<span class="sourceLineNo">998</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>   */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>  static class StatisticsThread extends Thread {<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span><a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>  public void logStats() {<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    // Log size<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    long totalSize = heapSize();<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    long freeSize = maxSize - totalSize;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>      + (stats.getHitCount() == 0<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>        ? "0"<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      + (stats.getHitCachingCount() == 0<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>        ? "0,"<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  }<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span><a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>  /**<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>   * Get counter statistics for this cache.<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   * &lt;p&gt;<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>   */<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>  @Override<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>  public CacheStats getStats() {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    return this.stats;<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>  }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span><a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span><a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>  @Override<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  public long heapSize() {<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    return getCurrentSize();<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>  }<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span><a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  }<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>  @Override<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>      private final long now = System.nanoTime();<a name="line.1052"></a>
+<span class="sourceLineNo">1002</span>    private final LruBlockCache lru;<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span><a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>      super("LruBlockCacheStats");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>      setDaemon(true);<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>      this.lru = lru;<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    }<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span><a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    @Override<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    public void run() {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      lru.logStats();<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>    }<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>  }<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span><a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>  public void logStats() {<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>    // Log size<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>    long totalSize = heapSize();<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>    long freeSize = maxSize - totalSize;<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      + (stats.getHitCount() == 0<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>        ? "0"<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>      + (stats.getHitCachingCount() == 0<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>        ? "0,"<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span><a name="line.1035"></a>
+<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>   * Get counter statistics for this cache.<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>   * &lt;p&gt;<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>   */<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>  @Override<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>  public CacheStats getStats() {<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    return this.stats;<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>  }<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span><a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span><a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>  @Override<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>  public long heapSize() {<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    return getCurrentSize();<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>      @Override<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>      public boolean hasNext() {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>        return iterator.hasNext();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>      }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>      @Override<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      public CachedBlock next() {<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        final LruCachedBlock b = iterator.next();<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        return new CachedBlock() {<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>          @Override<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>          public String toString() {<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>            return BlockCacheUtil.toString(this, now);<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>          }<a name="line.1066"></a>
+<span class="sourceLineNo">1054</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>  }<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span><a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  @Override<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span><a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>      private final long now = System.nanoTime();<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span><a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>          @Override<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>          public BlockPriority getBlockPriority() {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>            return b.getPriority();<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>          }<a name="line.1071"></a>
+<span class="sourceLineNo">1068</span>      @Override<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>      public boolean hasNext() {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>        return iterator.hasNext();<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>      }<a name="line.1071"></a>
 <span class="sourceLineNo">1072</span><a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>          @Override<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>          public BlockType getBlockType() {<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>            return b.getBuffer().getBlockType();<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>          }<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span><a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>          @Override<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>          public long getOffset() {<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>            return b.getCacheKey().getOffset();<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>          }<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span><a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>          @Override<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>          public long getSize() {<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>            return b.getBuffer().heapSize();<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>          }<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span><a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>          @Override<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>          public long getCachedTime() {<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>            return b.getCachedTime();<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>          }<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span><a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          @Override<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          public String getFilename() {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            return b.getCacheKey().getHfileName();<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          }<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span><a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          @Override<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>          public int compareTo(CachedBlock other) {<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>            if (diff != 0) {<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>              return diff;<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>            }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>            if (diff != 0) {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>              return diff;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>            }<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>            }<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>          }<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span><a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>          @Override<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>          public int hashCode() {<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>            return b.hashCode();<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>          }<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span><a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>          @Override<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>          public boolean equals(Object obj) {<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>            if (obj instanceof CachedBlock) {<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>              return compareTo(cb) == 0;<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>            } else {<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>              return false;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>            }<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>          }<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>        };<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>      }<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span><a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>      @Override<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>      public void remove() {<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>        throw new UnsupportedOperationException();<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>      }<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    };<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>  }<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span><a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span><a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>  long acceptableSize() {<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>  }<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span><a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>  private long minSize() {<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>  }<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>  private long singleSize() {<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1149"></a>
+<span class="sourceLineNo">1073</span>      @Override<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>      public CachedBlock next() {<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>        final LruCachedBlock b = iterator.next();<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>        return new CachedBlock() {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>          @Override<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>          public String toString() {<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>            return BlockCacheUtil.toString(this, now);<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>          }<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span><a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>          @Override<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>          public BlockPriority getBlockPriority() {<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>            return b.getPriority();<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>          }<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span><a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>          @Override<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>          public BlockType getBlockType() {<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>            return b.getBuffer().getBlockType();<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>          }<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span><a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>          @Override<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>          public long getOffset() {<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>            return b.getCacheKey().getOffset();<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>          }<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span><a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>          @Override<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>          public long getSize() {<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>            return b.getBuffer().heapSize();<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>          }<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>          @Override<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>          public long getCachedTime() {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>            return b.getCachedTime();<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>          }<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span><a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>          @Override<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>          public String getFilename() {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>            return b.getCacheKey().getHfileName();<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          }<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span><a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          @Override<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>          public int compareTo(CachedBlock other) {<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            if (diff != 0) {<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>              return diff;<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>            }<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>            if (diff != 0) {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>              return diff;<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>            }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>            }<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>          }<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span><a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>          @Override<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>          public int hashCode() {<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>            return b.hashCode();<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>          }<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span><a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>          @Override<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>          public boolean equals(Object obj) {<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>            if (obj instanceof CachedBlock) {<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>              return compareTo(cb) == 0;<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>            } else {<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>              return false;<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>            }<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>          }<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>        };<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>      }<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span><a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>      @Override<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>      public void remove() {<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>        throw new UnsupportedOperationException();<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span>      }<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>    };<a name="line.1149"></a>
 <span class="sourceLineNo">1150</span>  }<a name="line.1150"></a>
 <span class="sourceLineNo">1151</span><a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>  private long multiSize() {<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>  }<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span><a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>  private long memorySize() {<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>  }<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span><a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>  @Override<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>  public void shutdown() {<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>    if (victimHandler != null) {<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>      victimHandler.shutdown();<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>    }<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>    this.scheduleThreadPool.shutdown();<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>        try {<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>          Thread.sleep(10);<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>        } catch (InterruptedException e) {<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>          LOG.warn("Interrupted while sleeping");<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>          Thread.currentThread().interrupt();<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>          break;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>        }<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>      }<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    }<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span><a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>      LOG.debug("Still running " + runnables);<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>    }<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    this.evictionThread.shutdown();<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>  }<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>  /** Clears the cache. Used in tests. */<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>  public void clearCache() {<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>    this.map.clear();<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    this.elements.set(0);<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>  }<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span><a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>  /**<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>   * Used in testing. May be very inefficient.<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>   * @return the set of cached file names<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>   */<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    }<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    return fileNames;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>  }<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span><a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    for (LruCachedBlock block : map.values()) {<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>      Integer count = counts.get(encoding);<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    }<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    return counts;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>  }<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span><a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>    return map;<a name="line.1214"></a>
+<span class="sourceLineNo">1152</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span><a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>  long acceptableSize() {<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>  }<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span><a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>  private long minSize() {<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>  }<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>  private long singleSize() {<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>  }<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span><a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>  private long multiSize() {<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>  }<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>  private long memorySize() {<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>  }<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span><a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>  @Override<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>  public void shutdown() {<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>    if (victimHandler != null) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>      victimHandler.shutdown();<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>    }<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>    this.scheduleThreadPool.shutdown();<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>        try {<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>          Thread.sleep(10);<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span>        } catch (InterruptedException e) {<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span>          LOG.warn("Interrupted while sleeping");<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>          Thread.currentThread().interrupt();<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span>          break;<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>        }<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>      }<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span>    }<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span><a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>      LOG.debug("Still running " + runnables);<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>    }<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span>    this.evictionThread.shutdown();<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>  }<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span><a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>  /** Clears the cache. Used in tests. */<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span>  public void clearCache() {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>    this.map.clear();<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>    this.elements.set(0);<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>  }<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span><a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>  /**<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>   * Used in testing. May be very inefficient.<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span>   * @return the set of cached file names<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>   */<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span>    }<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>    return fileNames;<a name="line.1214"></a>
 <span class="sourceLineNo">1215</span>  }<a name="line.1215"></a>
 <span class="sourceLineNo">1216</span><a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>  @Override<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>  public BlockCache[] getBlockCaches() {<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>    if (victimHandler != null) {<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>    }<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>    return null;<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>  }<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>}<a name="line.1224"></a>
+<span class="sourceLineNo">1217</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>    for (LruCachedBlock block : map.values()) {<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>      Integer count = counts.get(encoding);<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>    }<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>    return counts;<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>  }<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span><a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>    return map;<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span>  }<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span><a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>  @Override<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>  public BlockCache[] getBlockCaches() {<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>    if (victimHandler != null) {<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>    }<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span>    return null;<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>  }<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>}<a name="line.1238"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
index da165dc..ed10198 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.EvictionThread.html
@@ -42,1194 +42,1208 @@
 <span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import java.util.concurrent.atomic.LongAdder;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.conf.Configuration;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.util.StringUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * operations.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;/p&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * least-frequently-used element to the eviction algorithm.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * &lt;p/&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * chunk the others are able to grow beyond their chunk size.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * &lt;p/&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;p/&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * thread.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;p/&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * &lt;p/&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * sizes and usage.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>@InterfaceAudience.Private<a name="line.87"></a>
-<span class="sourceLineNo">088</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    "hbase.lru.blockcache.single.percentage";<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * is a cluster-wide configuration<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /* Default Configuration Parameters */<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  /* Backing Concurrent Map Configuration */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  /* Eviction thresholds */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /* Priority buckets */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /* Statistics thread */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#computeIfPresent<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * (key, func). Besides, the func method must execute exactly once only when the key is present<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * and under the lock context, otherwise the reference count will be messed up. Notice that the<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  /** Eviction lock (locked when eviction in process) */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.158"></a>
+<span class="sourceLineNo">037</span>import org.apache.commons.lang3.mutable.MutableBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.util.StringUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * operations.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;/p&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * least-frequently-used element to the eviction algorithm.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * &lt;p/&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * chunk the others are able to grow beyond their chunk size.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * &lt;p/&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p/&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * thread.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * &lt;p/&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * &lt;p/&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * sizes and usage.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>@InterfaceAudience.Private<a name="line.88"></a>
+<span class="sourceLineNo">089</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    "hbase.lru.blockcache.single.percentage";<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * is a cluster-wide configuration<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  /* Default Configuration Parameters */<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /* Backing Concurrent Map Configuration */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  /* Eviction thresholds */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /* Priority buckets */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  /* Statistics thread */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  /**<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#k (key, func).<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * Besides, the func method must execute exactly once only when the key is present and under the<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * lock context, otherwise the reference count will be messed up. Notice that the<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that. Some code using<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * #computeIfPresent also expects the supplier to be executed only once. ConcurrentHashMap can<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * guarantee that. Other types may not.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  private final long maxBlockSize;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  private volatile boolean evictionInProgress = false;<a name="line.163"></a>
+<span class="sourceLineNo">160</span>  /** Eviction lock (locked when eviction in process) */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private final long maxBlockSize;<a name="line.163"></a>
 <span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /** Eviction thread */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  private transient final EvictionThread evictionThread;<a name="line.166"></a>
+<span class="sourceLineNo">165</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  private volatile boolean evictionInProgress = false;<a name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /** Current size of cache */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private final AtomicLong size;<a name="line.174"></a>
+<span class="sourceLineNo">168</span>  /** Eviction thread */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private transient final EvictionThread evictionThread;<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.174"></a>
 <span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  /** Current size of data blocks */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.177"></a>
+<span class="sourceLineNo">176</span>  /** Current size of cache */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  private final AtomicLong size;<a name="line.177"></a>
 <span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  /** Current size of index blocks */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.180"></a>
+<span class="sourceLineNo">179</span>  /** Current size of data blocks */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.180"></a>
 <span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /** Current size of bloom blocks */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.183"></a>
+<span class="sourceLineNo">182</span>  /** Current size of index blocks */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.183"></a>
 <span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  /** Current number of cached elements */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private final AtomicLong elements;<a name="line.186"></a>
+<span class="sourceLineNo">185</span>  /** Current size of bloom blocks */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  /** Current number of cached data block elements */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.189"></a>
+<span class="sourceLineNo">188</span>  /** Current number of cached elements */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  private final AtomicLong elements;<a name="line.189"></a>
 <span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /** Current number of cached index block elements */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.192"></a>
+<span class="sourceLineNo">191</span>  /** Current number of cached data block elements */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.192"></a>
 <span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  /** Current number of cached bloom block elements */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.195"></a>
+<span class="sourceLineNo">194</span>  /** Current number of cached index block elements */<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.195"></a>
 <span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /** Cache access count (sequential ID) */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private final AtomicLong count;<a name="line.198"></a>
+<span class="sourceLineNo">197</span>  /** Current number of cached bloom block elements */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /** hard capacity limit */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  private float hardCapacityLimitFactor;<a name="line.201"></a>
+<span class="sourceLineNo">200</span>  /** Cache access count (sequential ID) */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  private final AtomicLong count;<a name="line.201"></a>
 <span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  /** Cache statistics */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  private final CacheStats stats;<a name="line.204"></a>
+<span class="sourceLineNo">203</span>  /** hard capacity limit */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private float hardCapacityLimitFactor;<a name="line.204"></a>
 <span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  private long maxSize;<a name="line.207"></a>
+<span class="sourceLineNo">206</span>  /** Cache statistics */<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  private final CacheStats stats;<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /** Approximate block size */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  private long blockSize;<a name="line.210"></a>
+<span class="sourceLineNo">209</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  private long maxSize;<a name="line.210"></a>
 <span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  private float acceptableFactor;<a name="line.213"></a>
+<span class="sourceLineNo">212</span>  /** Approximate block size */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  private long blockSize;<a name="line.213"></a>
 <span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  private float minFactor;<a name="line.216"></a>
+<span class="sourceLineNo">215</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  private float acceptableFactor;<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  /** Single access bucket size */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  private float singleFactor;<a name="line.219"></a>
+<span class="sourceLineNo">218</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  private float minFactor;<a name="line.219"></a>
 <span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /** Multiple access bucket size */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private float multiFactor;<a name="line.222"></a>
+<span class="sourceLineNo">221</span>  /** Single access bucket size */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  private float singleFactor;<a name="line.222"></a>
 <span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>  /** In-memory bucket size */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  private float memoryFactor;<a name="line.225"></a>
+<span class="sourceLineNo">224</span>  /** Multiple access bucket size */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  private float multiFactor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** Overhead of the structure itself */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  private long overhead;<a name="line.228"></a>
+<span class="sourceLineNo">227</span>  /** In-memory bucket size */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private float memoryFactor;<a name="line.228"></a>
 <span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  private boolean forceInMemory;<a name="line.231"></a>
+<span class="sourceLineNo">230</span>  /** Overhead of the structure itself */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private long overhead;<a name="line.231"></a>
 <span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  private transient BlockCache victimHandler = null;<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * fine).<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param blockSize approximate size of each block, in bytes<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    this(maxSize, blockSize, true);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    this(maxSize, blockSize, true, conf);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    this.maxBlockSize = maxBlockSize;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    if (<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        || memoryFactor &lt; 0<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    ) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      throw new IllegalArgumentException(<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.305"></a>
+<span class="sourceLineNo">233</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  private boolean forceInMemory;<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>  /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  private transient BlockCache victimHandler = null;<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * fine).<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * &lt;p&gt;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param blockSize approximate size of each block, in bytes<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    this(maxSize, blockSize, true);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    this(maxSize, blockSize, true, conf);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    this.maxBlockSize = maxBlockSize;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    if (<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        || memoryFactor &lt; 0<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    ) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      throw new IllegalArgumentException(<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.305"></a>
 <span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.308"></a>
+<span class="sourceLineNo">307</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    this.maxSize = maxSize;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    this.blockSize = blockSize;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    this.forceInMemory = forceInMemory;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    this.minFactor = minFactor;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    this.acceptableFactor = acceptableFactor;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    this.singleFactor = singleFactor;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    this.multiFactor = multiFactor;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    this.memoryFactor = memoryFactor;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    this.count = new AtomicLong(0);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    this.elements = new AtomicLong(0);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    this.size = new AtomicLong(this.overhead);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    if (evictionThread) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      this.evictionThread = new EvictionThread(this);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      this.evictionThread = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    // every five minutes.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    if (victimHandler != null) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    victimHandler = requireNonNull(victimCache);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  public void setMaxSize(long maxSize) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.maxSize = maxSize;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      runEviction();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>  /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * JVM, so need a retain here.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @param buf the original block<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * @return an block with an heap memory backend.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    if (buf instanceof HFileBlock) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      if (blk.isSharedMem()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return buf.retain();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  // BlockCache implementation<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Cache the block with the specified name and buffer.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   * &lt;p&gt;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * this can happen, for which we compare the buffer contents.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param cacheKey block's cache key<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @param buf      block buffer<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param inMemory if block is in-memory<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   */<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  @Override<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      // If there are a lot of blocks that are too<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      // big this can make the logs way too noisy.<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      // So we log 2%<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (stats.failInsert() % 50 == 0) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          + maxBlockSize);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      return;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    long currentSize = size.get();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    long currentAcceptableSize = acceptableSize();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      stats.failInsert();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (LOG.isTraceEnabled()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      if (!evictionInProgress) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        runEviction();<a name="line.420"></a>
+<span class="sourceLineNo">310</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    this.maxSize = maxSize;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    this.blockSize = blockSize;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    this.forceInMemory = forceInMemory;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    this.minFactor = minFactor;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    this.acceptableFactor = acceptableFactor;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    this.singleFactor = singleFactor;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    this.multiFactor = multiFactor;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    this.memoryFactor = memoryFactor;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    this.count = new AtomicLong(0);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    this.elements = new AtomicLong(0);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    this.size = new AtomicLong(this.overhead);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    if (evictionThread) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      this.evictionThread = new EvictionThread(this);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.evictionThread = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    // every five minutes.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (victimHandler != null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    victimHandler = requireNonNull(victimCache);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void setMaxSize(long maxSize) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.maxSize = maxSize;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      runEviction();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>  /**<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   * JVM, so need a retain here.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   * @param buf the original block<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * @return an block with an heap memory backend.<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   */<a name="line.370"></a>
+<span class="sourceLineNo">371</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (buf instanceof HFileBlock) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      if (blk.isSharedMem()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    return buf.retain();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>  // BlockCache implementation<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Cache the block with the specified name and buffer.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * &lt;p&gt;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * this can happen, for which we compare the buffer contents.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param cacheKey block's cache key<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param buf      block buffer<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param inMemory if block is in-memory<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  @Override<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      // If there are a lot of blocks that are too<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // big this can make the logs way too noisy.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      // So we log 2%<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      if (stats.failInsert() % 50 == 0) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          + maxBlockSize);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      return;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    long currentSize = size.get();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    long currentAcceptableSize = acceptableSize();<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      stats.failInsert();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      if (LOG.isTraceEnabled()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.420"></a>
 <span class="sourceLineNo">421</span>      }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      return;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // Ensure that the block is an heap one.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    buf = asReferencedHeapBlock(buf);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    map.put(cacheKey, cb);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    long val = elements.incrementAndGet();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (buf.getBlockType().isBloom()) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      bloomBlockElements.increment();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      indexBlockElements.increment();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    } else if (buf.getBlockType().isData()) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      dataBlockElements.increment();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    if (LOG.isTraceEnabled()) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      long size = map.size();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      assertCounterSanity(size, val);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      runEviction();<a name="line.442"></a>
+<span class="sourceLineNo">422</span>      if (!evictionInProgress) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        runEviction();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    // Ensure that the block is an heap one.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    buf = asReferencedHeapBlock(buf);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    map.put(cacheKey, cb);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    long val = elements.incrementAndGet();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    if (buf.getBlockType().isBloom()) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      bloomBlockElements.increment();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      indexBlockElements.increment();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    } else if (buf.getBlockType().isData()) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      dataBlockElements.increment();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    if (LOG.isTraceEnabled()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      long size = map.size();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      assertCounterSanity(size, val);<a name="line.442"></a>
 <span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>  /**<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * use with TRACE level logging and -ea JVM.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    if (counterVal &lt; 0) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        + ", mapSize=" + mapSize);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (pct_diff &gt; 0.05) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.459"></a>
-<span class="sourceLineNo">460</span>          + ", mapSize=" + mapSize);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>  /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * Cache the block with the specified name and buffer.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   * &lt;p&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   * otherwise the caching size is based on off-heap.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * @param cacheKey block's cache key<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * @param buf      block buffer<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    cacheBlock(cacheKey, buf, false);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   */<a name="line.483"></a>
-<span class="sourceLineNo">484</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    long heapsize = cb.heapSize();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (evict) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      heapsize *= -1;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    if (bt != null) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (bt.isBloom()) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        bloomBlockSize.add(heapsize);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      } else if (bt.isIndex()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        indexBlockSize.add(heapsize);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      } else if (bt.isData()) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        dataBlockSize.add(heapsize);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    return size.addAndGet(heapsize);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * Get the buffer of the block with the specified name.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * @param cacheKey           block's cache key<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   *                           double counting cache misses when doing double-check locking)<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    boolean updateCacheMetrics) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      // see HBASE-22422.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      val.getBuffer().retain();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      return val;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    });<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    if (cb == null) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      // If there is another block cache then try and read there.<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      // However if this is a retry ( second time in double checked locking )<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        // Promote this to L1.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        if (result != null) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>          if (caching) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>          }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return result;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      }<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return null;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    if (updateCacheMetrics) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    cb.access(count.incrementAndGet());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    return cb.getBuffer();<a name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * Whether the cache contains block with specified cacheKey<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * @return true if contains the block<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  @Override<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    return map.containsKey(cacheKey);<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  @Override<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>  }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>  /**<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   * log-access-time map.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   * &lt;p&gt;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.569"></a>
-<span class="sourceLineNo">570</span>   * @return the number of blocks evicted<a name="line.570"></a>
-<span class="sourceLineNo">571</span>   */<a name="line.571"></a>
-<span class="sourceLineNo">572</span>  @Override<a name="line.572"></a>
-<span class="sourceLineNo">573</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    int numEvicted = 0;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        if (evictBlock(key)) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          ++numEvicted;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    if (victimHandler != null) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    return numEvicted;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * read again later<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @return the heap size of evicted block<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   */<a name="line.593"></a>
-<span class="sourceLineNo">594</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    LruCachedBlock previous = map.remove(block.getCacheKey());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    if (previous == null) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return 0;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    updateSizeMetrics(block, true);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    long val = elements.decrementAndGet();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    if (LOG.isTraceEnabled()) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      long size = map.size();<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      assertCounterSanity(size, val);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    if (bt.isBloom()) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      bloomBlockElements.decrement();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    } else if (bt.isIndex()) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      indexBlockElements.decrement();<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    } else if (bt.isData()) {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      dataBlockElements.decrement();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    if (evictedByEvictionProcess) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      // update the stats counter.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      if (victimHandler != null) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        victimHandler.cacheBlock(block.getCacheKey(), block.getBuffer());<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    // NOT move this up because if do that then the victimHandler may access the buffer with<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    // refCnt = 0 which is disallowed.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    previous.getBuffer().release();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    return block.heapSize();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>  /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   * Multi-threaded call to run the eviction process.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   */<a name="line.630"></a>
-<span class="sourceLineNo">631</span>  private void runEviction() {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      evict();<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    } else {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      evictionThread.evict();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>  }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>  boolean isEvictionInProgress() {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    return evictionInProgress;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>  long getOverhead() {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    return overhead;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>  /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   * Eviction method.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>   */<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  void evict() {<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>    // Ensure only one eviction at a time<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    if (!evictionLock.tryLock()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    }<a name="line.655"></a>
+<span class="sourceLineNo">444</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      runEviction();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * use with TRACE level logging and -ea JVM.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (counterVal &lt; 0) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        + ", mapSize=" + mapSize);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      if (pct_diff &gt; 0.05) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          + ", mapSize=" + mapSize);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   * Cache the block with the specified name and buffer.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   * &lt;p&gt;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   * otherwise the caching size is based on off-heap.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>   * @param cacheKey block's cache key<a name="line.475"></a>
+<span class="sourceLineNo">476</span>   * @param buf      block buffer<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   */<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  @Override<a name="line.478"></a>
+<span class="sourceLineNo">479</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    cacheBlock(cacheKey, buf, false);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
+<span class="sourceLineNo">484</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
+<span class="sourceLineNo">487</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    long heapsize = cb.heapSize();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    if (evict) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      heapsize *= -1;<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    if (bt != null) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (bt.isBloom()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        bloomBlockSize.add(heapsize);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      } else if (bt.isIndex()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        indexBlockSize.add(heapsize);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      } else if (bt.isData()) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>        dataBlockSize.add(heapsize);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    return size.addAndGet(heapsize);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>  /**<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   * Get the buffer of the block with the specified name.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   * @param cacheKey           block's cache key<a name="line.507"></a>
+<span class="sourceLineNo">508</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   *                           double counting cache misses when doing double-check locking)<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  @Override<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    boolean updateCacheMetrics) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      // see HBASE-22422.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      val.getBuffer().retain();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      return val;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    });<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    if (cb == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      // If there is another block cache then try and read there.<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      // However if this is a retry ( second time in double checked locking )<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        // Promote this to L1.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        if (result != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          if (caching) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        return result;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return null;<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    if (updateCacheMetrics) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    cb.access(count.incrementAndGet());<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    return cb.getBuffer();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>  }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>  /**<a name="line.553"></a>
+<span class="sourceLineNo">554</span>   * Whether the cache contains block with specified cacheKey<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * @return true if contains the block<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   */<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  @Override<a name="line.557"></a>
+<span class="sourceLineNo">558</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    return map.containsKey(cacheKey);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>  @Override<a name="line.562"></a>
+<span class="sourceLineNo">563</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>  }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>  /**<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   * log-access-time map.<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * &lt;p&gt;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   * @return the number of blocks evicted<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   */<a name="line.575"></a>
+<span class="sourceLineNo">576</span>  @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    int numEvicted = 0;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        if (evictBlock(key)) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          ++numEvicted;<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    if (victimHandler != null) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    return numEvicted;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * read again later<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @return the heap size of evicted block<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   */<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    final MutableBoolean evicted = new MutableBoolean(false);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    map.computeIfPresent(block.getCacheKey(), (k, v) -&gt; {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      // Run the victim handler before we remove the mapping in the L1 map. It must complete<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      // quickly because other removal or insertion operations can be blocked in the meantime.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (evictedByEvictionProcess &amp;&amp; victimHandler != null) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        victimHandler.cacheBlock(k, v.getBuffer());<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      // NOT move this up because if we do that then the victimHandler may access the buffer with<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      // refCnt = 0 which is disallowed.<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      v.getBuffer().release();<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      evicted.setTrue();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      // By returning null from the supplier we remove the mapping from the L1 map.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      return null;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    });<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    // If we didn't find anything to evict there is nothing more to do here.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    if (evicted.isFalse()) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return 0;<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    }<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    // We evicted the block so update L1 statistics.<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    updateSizeMetrics(block, true);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    long val = elements.decrementAndGet();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    if (LOG.isTraceEnabled()) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      long size = map.size();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      assertCounterSanity(size, val);<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    }<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (bt.isBloom()) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      bloomBlockElements.decrement();<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    } else if (bt.isIndex()) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      indexBlockElements.decrement();<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    } else if (bt.isData()) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      dataBlockElements.decrement();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    if (evictedByEvictionProcess) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      // update the stats counter.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    return block.heapSize();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
+<span class="sourceLineNo">643</span>   * Multi-threaded call to run the eviction process.<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
+<span class="sourceLineNo">645</span>  private void runEviction() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      evict();<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      evictionThread.evict();<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>  boolean isEvictionInProgress() {<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    return evictionInProgress;<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
 <span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    try {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      evictionInProgress = true;<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      long currentSize = this.size.get();<a name="line.659"></a>
-<span class="sourceLineNo">660</span>      long bytesToFree = currentSize - minSize();<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span>      if (LOG.isTraceEnabled()) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span>      if (bytesToFree &lt;= 0) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        return;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      }<a name="line.669"></a>
+<span class="sourceLineNo">657</span>  long getOverhead() {<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    return overhead;<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span>  /**<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * Eviction method.<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   */<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  void evict() {<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>    // Ensure only one eviction at a time<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    if (!evictionLock.tryLock()) {<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      return;<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
 <span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>      // Instantiate priority buckets<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.674"></a>
+<span class="sourceLineNo">671</span>    try {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      evictionInProgress = true;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      long currentSize = this.size.get();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      long bytesToFree = currentSize - minSize();<a name="line.674"></a>
 <span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>      // Scan entire map putting into appropriate buckets<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        switch (cachedBlock.getPriority()) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>          case SINGLE: {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>            bucketSingle.add(cachedBlock);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>            break;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>          }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>          case MULTI: {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>            bucketMulti.add(cachedBlock);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>            break;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>          }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>          case MEMORY: {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>            bucketMemory.add(cachedBlock);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            break;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>          }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>      long bytesFreed = 0;<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        long s = bucketSingle.totalSize();<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        long m = bucketMulti.totalSize();<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        if (bytesToFree &gt; (s + m)) {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.699"></a>
-<span class="sourceLineNo">700</span>          // so the single and multi buckets will be emptied<a name="line.700"></a>
-<span class="sourceLineNo">701</span>          bytesFreed = bucketSingle.free(s);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>          bytesFreed += bucketMulti.free(m);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>          if (LOG.isTraceEnabled()) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>            LOG.trace(<a name="line.704"></a>
-<span class="sourceLineNo">705</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.705"></a>
-<span class="sourceLineNo">706</span>          }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>          if (LOG.isTraceEnabled()) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            LOG.trace(<a name="line.709"></a>
-<span class="sourceLineNo">710</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        } else {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>          // this means no need to evict block in memory bucket,<a name="line.713"></a>
-<span class="sourceLineNo">714</span>          // and we try best to make the ratio between single-bucket and<a name="line.714"></a>
-<span class="sourceLineNo">715</span>          // multi-bucket is 1:2<a name="line.715"></a>
-<span class="sourceLineNo">716</span>          long bytesRemain = s + m - bytesToFree;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>          if (3 * s &lt;= bytesRemain) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            // single-bucket is small enough that no eviction happens for it<a name="line.718"></a>
-<span class="sourceLineNo">719</span>            // hence all eviction goes from multi-bucket<a name="line.719"></a>
-<span class="sourceLineNo">720</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            // hence all eviction goes from single-bucket<a name="line.723"></a>
-<span class="sourceLineNo">724</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>          } else {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>            // both buckets need to evict some blocks<a name="line.726"></a>
-<span class="sourceLineNo">727</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>            }<a name="line.730"></a>
-<span class="sourceLineNo">731</span>          }<a name="line.731"></a>
-<span class="sourceLineNo">732</span>        }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>        bucketQueue.add(bucketSingle);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        bucketQueue.add(bucketMulti);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        bucketQueue.add(bucketMemory);<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>        int remainingBuckets = bucketQueue.size();<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>        BlockBucket bucket;<a name="line.742"></a>
-<span class="sourceLineNo">743</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>          long overflow = bucket.overflow();<a name="line.744"></a>
-<span class="sourceLineNo">745</span>          if (overflow &gt; 0) {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>            long bucketBytesToFree =<a name="line.746"></a>
-<span class="sourceLineNo">747</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>          remainingBuckets--;<a name="line.750"></a>
-<span class="sourceLineNo">751</span>        }<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      }<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (LOG.isTraceEnabled()) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        long single = bucketSingle.totalSize();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        long multi = bucketMulti.totalSize();<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        long memory = bucketMemory.totalSize();<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        LOG.trace(<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.758"></a>
-<span class="sourceLineNo">759</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.759"></a>
-<span class="sourceLineNo">760</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.760"></a>
-<span class="sourceLineNo">761</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    } finally {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      stats.evict();<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      evictionInProgress = false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      evictionLock.unlock();<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>  }<a name="line.768"></a>
-<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span>  @Override<a name="line.770"></a>
-<span class="sourceLineNo">771</span>  public String toString() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.772"></a>
-<span class="sourceLineNo">773</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.774"></a>
-<span class="sourceLineNo">775</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      .toString();<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span>  /**<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.788"></a>
-<span class="sourceLineNo">789</span><a name="line.789"></a>
-<span class="sourceLineNo">790</span>    private final String name;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    private LruCachedBlockQueue queue;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    private long totalSize = 0;<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    private long bucketSize;<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      this.name = name;<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      this.bucketSize = bucketSize;<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      totalSize = 0;<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    }<a name="line.800"></a>
-<span class="sourceLineNo">801</span><a name="line.801"></a>
-<span class="sourceLineNo">802</span>    public void add(LruCachedBlock block) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      totalSize += block.heapSize();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      queue.add(block);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    public long free(long toFree) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (LOG.isTraceEnabled()) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      LruCachedBlock cb;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      long freedBytes = 0;<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      while ((cb = queue.pollLast()) != null) {<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        freedBytes += evictBlock(cb, true);<a name="line.814"></a>
-<span class="sourceLineNo">815</span>        if (freedBytes &gt;= toFree) {<a name="line.815"></a>
-<span class="sourceLineNo">816</span>          return freedBytes;<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        }<a name="line.817"></a>
-<span class="sourceLineNo">818</span>      }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      if (LOG.isTraceEnabled()) {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      }<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      return freedBytes;<a name="line.822"></a>
-<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span>    public long overflow() {<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      return totalSize - bucketSize;<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>    public long totalSize() {<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      return totalSize;<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span>    @Override<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    public int compareTo(BlockBucket that) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>    @Override<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    public boolean equals(Object that) {<a name="line.839"></a>
-<span class="sourceLineNo">840</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span>        return false;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>      }<a name="line.842"></a>
-<span class="sourceLineNo">843</span>      return compareTo((BlockBucket) that) == 0;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    }<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    @Override<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    public int hashCode() {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    }<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    @Override<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    public String toString() {<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.853"></a>
-<span class="sourceLineNo">854</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.854"></a>
-<span class="sourceLineNo">855</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    }<a name="line.856"></a>
-<span class="sourceLineNo">857</span>  }<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>  /**<a name="line.859"></a>
-<span class="sourceLineNo">860</span>   * Get the maximum size of this cache.<a name="line.860"></a>
-<span class="sourceLineNo">861</span>   * @return max size in bytes<a name="line.861"></a>
-<span class="sourceLineNo">862</span>   */<a name="line.862"></a>
-<span class="sourceLineNo">863</span><a name="line.863"></a>
-<span class="sourceLineNo">864</span>  @Override<a name="line.864"></a>
-<span class="sourceLineNo">865</span>  public long getMaxSize() {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    return this.maxSize;<a name="line.866"></a>
-<span class="sourceLineNo">867</span>  }<a name="line.867"></a>
-<span class="sourceLineNo">868</span><a name="line.868"></a>
-<span class="sourceLineNo">869</span>  @Override<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  public long getCurrentSize() {<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    return this.size.get();<a name="line.871"></a>
-<span class="sourceLineNo">872</span>  }<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>  @Override<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  public long getCurrentDataSize() {<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    return this.dataBlockSize.sum();<a name="line.876"></a>
-<span class="sourceLineNo">877</span>  }<a name="line.877"></a>
-<span class="sourceLineNo">878</span><a name="line.878"></a>
-<span class="sourceLineNo">879</span>  public long getCurrentIndexSize() {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    return this.indexBlockSize.sum();<a name="line.880"></a>
+<span class="sourceLineNo">676</span>      if (LOG.isTraceEnabled()) {<a name="line.676"></a>
+<span class="sourceLineNo">677</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.677"></a>
+<span class="sourceLineNo">678</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      }<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>      if (bytesToFree &lt;= 0) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        return;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>      // Instantiate priority buckets<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.686"></a>
+<span class="sourceLineNo">687</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>      // Scan entire map putting into appropriate buckets<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>        switch (cachedBlock.getPriority()) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span>          case SINGLE: {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            bucketSingle.add(cachedBlock);<a name="line.694"></a>
+<span class="sourceLineNo">695</span>            break;<a name="line.695"></a>
+<span class="sourceLineNo">696</span>          }<a name="line.696"></a>
+<span class="sourceLineNo">697</span>          case MULTI: {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>            bucketMulti.add(cachedBlock);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>            break;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>          }<a name="line.700"></a>
+<span class="sourceLineNo">701</span>          case MEMORY: {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>            bucketMemory.add(cachedBlock);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>            break;<a name="line.703"></a>
+<span class="sourceLineNo">704</span>          }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>        }<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>      long bytesFreed = 0;<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        long s = bucketSingle.totalSize();<a name="line.710"></a>
+<span class="sourceLineNo">711</span>        long m = bucketMulti.totalSize();<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        if (bytesToFree &gt; (s + m)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.713"></a>
+<span class="sourceLineNo">714</span>          // so the single and multi buckets will be emptied<a name="line.714"></a>
+<span class="sourceLineNo">715</span>          bytesFreed = bucketSingle.free(s);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>          bytesFreed += bucketMulti.free(m);<a name="line.716"></a>
+<span class="sourceLineNo">717</span>          if (LOG.isTraceEnabled()) {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>            LOG.trace(<a name="line.718"></a>
+<span class="sourceLineNo">719</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.719"></a>
+<span class="sourceLineNo">720</span>          }<a name="line.720"></a>
+<span class="sourceLineNo">721</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.721"></a>
+<span class="sourceLineNo">722</span>          if (LOG.isTraceEnabled()) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>            LOG.trace(<a name="line.723"></a>
+<span class="sourceLineNo">724</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.724"></a>
+<span class="sourceLineNo">725</span>          }<a name="line.725"></a>
+<span class="sourceLineNo">726</span>        } else {<a name="line.726"></a>
+<span class="sourceLineNo">727</span>          // this means no need to evict block in memory bucket,<a name="line.727"></a>
+<span class="sourceLineNo">728</span>          // and we try best to make the ratio between single-bucket and<a name="line.728"></a>
+<span class="sourceLineNo">729</span>          // multi-bucket is 1:2<a name="line.729"></a>
+<span class="sourceLineNo">730</span>          long bytesRemain = s + m - bytesToFree;<a name="line.730"></a>
+<span class="sourceLineNo">731</span>          if (3 * s &lt;= bytesRemain) {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>            // single-bucket is small enough that no eviction happens for it<a name="line.732"></a>
+<span class="sourceLineNo">733</span>            // hence all eviction goes from multi-bucket<a name="line.733"></a>
+<span class="sourceLineNo">734</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.736"></a>
+<span class="sourceLineNo">737</span>            // hence all eviction goes from single-bucket<a name="line.737"></a>
+<span class="sourceLineNo">738</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.738"></a>
+<span class="sourceLineNo">739</span>          } else {<a name="line.739"></a>
+<span class="sourceLineNo">740</span>            // both buckets need to evict some blocks<a name="line.740"></a>
+<span class="sourceLineNo">741</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.742"></a>
+<span class="sourceLineNo">743</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>            }<a name="line.744"></a>
+<span class="sourceLineNo">745</span>          }<a name="line.745"></a>
+<span class="sourceLineNo">746</span>        }<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      } else {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span>        bucketQueue.add(bucketSingle);<a name="line.750"></a>
+<span class="sourceLineNo">751</span>        bucketQueue.add(bucketMulti);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>        bucketQueue.add(bucketMemory);<a name="line.752"></a>
+<span class="sourceLineNo">753</span><a name="line.753"></a>
+<span class="sourceLineNo">754</span>        int remainingBuckets = bucketQueue.size();<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>        BlockBucket bucket;<a name="line.756"></a>
+<span class="sourceLineNo">757</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.757"></a>
+<span class="sourceLineNo">758</span>          long overflow = bucket.overflow();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>          if (overflow &gt; 0) {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>            long bucketBytesToFree =<a name="line.760"></a>
+<span class="sourceLineNo">761</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.761"></a>
+<span class="sourceLineNo">762</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.762"></a>
+<span class="sourceLineNo">763</span>          }<a name="line.763"></a>
+<span class="sourceLineNo">764</span>          remainingBuckets--;<a name="line.764"></a>
+<span class="sourceLineNo">765</span>        }<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>      if (LOG.isTraceEnabled()) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        long single = bucketSingle.totalSize();<a name="line.768"></a>
+<span class="sourceLineNo">769</span>        long multi = bucketMulti.totalSize();<a name="line.769"></a>
+<span class="sourceLineNo">770</span>        long memory = bucketMemory.totalSize();<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        LOG.trace(<a name="line.771"></a>
+<span class="sourceLineNo">772</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.773"></a>
+<span class="sourceLineNo">774</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.775"></a>
+<span class="sourceLineNo">776</span>      }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    } finally {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      stats.evict();<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      evictionInProgress = false;<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      evictionLock.unlock();<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  @Override<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  public String toString() {<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      .toString();<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
+<span class="sourceLineNo">796</span><a name="line.796"></a>
+<span class="sourceLineNo">797</span>  /**<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   */<a name="line.801"></a>
+<span class="sourceLineNo">802</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span>    private final String name;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>    private LruCachedBlockQueue queue;<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    private long totalSize = 0;<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    private long bucketSize;<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      this.name = name;<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      this.bucketSize = bucketSize;<a name="line.811"></a>
+<span class="sourceLineNo">812</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      totalSize = 0;<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span><a name="line.815"></a>
+<span class="sourceLineNo">816</span>    public void add(LruCachedBlock block) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      totalSize += block.heapSize();<a name="line.817"></a>
+<span class="sourceLineNo">818</span>      queue.add(block);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    }<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>    public long free(long toFree) {<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      if (LOG.isTraceEnabled()) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      }<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      LruCachedBlock cb;<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      long freedBytes = 0;<a name="line.826"></a>
+<span class="sourceLineNo">827</span>      while ((cb = queue.pollLast()) != null) {<a name="line.827"></a>
+<span class="sourceLineNo">828</span>        freedBytes += evictBlock(cb, true);<a name="line.828"></a>
+<span class="sourceLineNo">829</span>        if (freedBytes &gt;= toFree) {<a name="line.829"></a>
+<span class="sourceLineNo">830</span>          return freedBytes;<a name="line.830"></a>
+<span class="sourceLineNo">831</span>        }<a name="line.831"></a>
+<span class="sourceLineNo">832</span>      }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>      if (LOG.isTraceEnabled()) {<a name="line.833"></a>
+<span class="sourceLineNo">834</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      }<a name="line.835"></a>
+<span class="sourceLineNo">836</span>      return freedBytes;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    }<a name="line.837"></a>
+<span class="sourceLineNo">838</span><a name="line.838"></a>
+<span class="sourceLineNo">839</span>    public long overflow() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      return totalSize - bucketSize;<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    }<a name="line.841"></a>
+<span class="sourceLineNo">842</span><a name="line.842"></a>
+<span class="sourceLineNo">843</span>    public long totalSize() {<a name="line.843"></a>
+<span class="sourceLineNo">844</span>      return totalSize;<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    }<a name="line.845"></a>
+<span class="sourceLineNo">846</span><a name="line.846"></a>
+<span class="sourceLineNo">847</span>    @Override<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    public int compareTo(BlockBucket that) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    }<a name="line.850"></a>
+<span class="sourceLineNo">851</span><a name="line.851"></a>
+<span class="sourceLineNo">852</span>    @Override<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    public boolean equals(Object that) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>        return false;<a name="line.855"></a>
+<span class="sourceLineNo">856</span>      }<a name="line.856"></a>
+<span class="sourceLineNo">857</span>      return compareTo((BlockBucket) that) == 0;<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    }<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span>    @Override<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    public int hashCode() {<a name="line.861"></a>
+<span class="sourceLineNo">862</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    }<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>    @Override<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    public String toString() {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.867"></a>
+<span class="sourceLineNo">868</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.868"></a>
+<span class="sourceLineNo">869</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.869"></a>
+<span class="sourceLineNo">870</span>    }<a name="line.870"></a>
+<span class="sourceLineNo">871</span>  }<a name="line.871"></a>
+<span class="sourceLineNo">872</span><a name="line.872"></a>
+<span class="sourceLineNo">873</span>  /**<a name="line.873"></a>
+<span class="sourceLineNo">874</span>   * Get the maximum size of this cache.<a name="line.874"></a>
+<span class="sourceLineNo">875</span>   * @return max size in bytes<a name="line.875"></a>
+<span class="sourceLineNo">876</span>   */<a name="line.876"></a>
+<span class="sourceLineNo">877</span><a name="line.877"></a>
+<span class="sourceLineNo">878</span>  @Override<a name="line.878"></a>
+<span class="sourceLineNo">879</span>  public long getMaxSize() {<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    return this.maxSize;<a name="line.880"></a>
 <span class="sourceLineNo">881</span>  }<a name="line.881"></a>
 <span class="sourceLineNo">882</span><a name="line.882"></a>
-<span class="sourceLineNo">883</span>  public long getCurrentBloomSize() {<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    return this.bloomBlockSize.sum();<a name="line.884"></a>
-<span class="sourceLineNo">885</span>  }<a name="line.885"></a>
-<span class="sourceLineNo">886</span><a name="line.886"></a>
-<span class="sourceLineNo">887</span>  @Override<a name="line.887"></a>
-<span class="sourceLineNo">888</span>  public long getFreeSize() {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    return getMaxSize() - getCurrentSize();<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  }<a name="line.890"></a>
-<span class="sourceLineNo">891</span><a name="line.891"></a>
-<span class="sourceLineNo">892</span>  @Override<a name="line.892"></a>
-<span class="sourceLineNo">893</span>  public long size() {<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    return getMaxSize();<a name="line.894"></a>
+<span class="sourceLineNo">883</span>  @Override<a name="line.883"></a>
+<span class="sourceLineNo">884</span>  public long getCurrentSize() {<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    return this.size.get();<a name="line.885"></a>
+<span class="sourceLineNo">886</span>  }<a name="line.886"></a>
+<span class="sourceLineNo">887</span><a name="line.887"></a>
+<span class="sourceLineNo">888</span>  @Override<a name="line.888"></a>
+<span class="sourceLineNo">889</span>  public long getCurrentDataSize() {<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    return this.dataBlockSize.sum();<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  public long getCurrentIndexSize() {<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    return this.indexBlockSize.sum();<a name="line.894"></a>
 <span class="sourceLineNo">895</span>  }<a name="line.895"></a>
 <span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  @Override<a name="line.897"></a>
-<span class="sourceLineNo">898</span>  public long getBlockCount() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    return this.elements.get();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>  }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>  @Override<a name="line.902"></a>
-<span class="sourceLineNo">903</span>  public long getDataBlockCount() {<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    return this.dataBlockElements.sum();<a name="line.904"></a>
-<span class="sourceLineNo">905</span>  }<a name="line.905"></a>
-<span class="sourceLineNo">906</span><a name="line.906"></a>
-<span class="sourceLineNo">907</span>  public long getIndexBlockCount() {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    return this.indexBlockElements.sum();<a name="line.908"></a>
+<span class="sourceLineNo">897</span>  public long getCurrentBloomSize() {<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    return this.bloomBlockSize.sum();<a name="line.898"></a>
+<span class="sourceLineNo">899</span>  }<a name="line.899"></a>
+<span class="sourceLineNo">900</span><a name="line.900"></a>
+<span class="sourceLineNo">901</span>  @Override<a name="line.901"></a>
+<span class="sourceLineNo">902</span>  public long getFreeSize() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    return getMaxSize() - getCurrentSize();<a name="line.903"></a>
+<span class="sourceLineNo">904</span>  }<a name="line.904"></a>
+<span class="sourceLineNo">905</span><a name="line.905"></a>
+<span class="sourceLineNo">906</span>  @Override<a name="line.906"></a>
+<span class="sourceLineNo">907</span>  public long size() {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    return getMaxSize();<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  public long getBloomBlockCount() {<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    return this.bloomBlockElements.sum();<a name="line.912"></a>
-<span class="sourceLineNo">913</span>  }<a name="line.913"></a>
-<span class="sourceLineNo">914</span><a name="line.914"></a>
-<span class="sourceLineNo">915</span>  EvictionThread getEvictionThread() {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    return this.evictionThread;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>  }<a name="line.917"></a>
-<span class="sourceLineNo">918</span><a name="line.918"></a>
-<span class="sourceLineNo">919</span>  /*<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.920"></a>
-<span class="sourceLineNo">921</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.921"></a>
-<span class="sourceLineNo">922</span>   * LruBlockCache#runEviction()}<a name="line.922"></a>
-<span class="sourceLineNo">923</span>   */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  static class EvictionThread extends Thread {<a name="line.924"></a>
-<span class="sourceLineNo">925</span><a name="line.925"></a>
-<span class="sourceLineNo">926</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    private volatile boolean go = true;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    // flag set after enter the run method, used for test<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    private boolean enteringRun = false;<a name="line.929"></a>
-<span class="sourceLineNo">930</span><a name="line.930"></a>
-<span class="sourceLineNo">931</span>    public EvictionThread(LruBlockCache cache) {<a name="line.931"></a>
-<span class="sourceLineNo">932</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      setDaemon(true);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    }<a name="line.935"></a>
-<span class="sourceLineNo">936</span><a name="line.936"></a>
-<span class="sourceLineNo">937</span>    @Override<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    public void run() {<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      enteringRun = true;<a name="line.939"></a>
-<span class="sourceLineNo">940</span>      while (this.go) {<a name="line.940"></a>
-<span class="sourceLineNo">941</span>        synchronized (this) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>          try {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>          } catch (InterruptedException e) {<a name="line.944"></a>
-<span class="sourceLineNo">945</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.945"></a>
-<span class="sourceLineNo">946</span>            Thread.currentThread().interrupt();<a name="line.946"></a>
-<span class="sourceLineNo">947</span>          }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>        }<a name="line.948"></a>
-<span class="sourceLineNo">949</span>        LruBlockCache cache = this.cache.get();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        if (cache == null) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>          this.go = false;<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          break;<a name="line.952"></a>
-<span class="sourceLineNo">953</span>        }<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        cache.evict();<a name="line.954"></a>
-<span class="sourceLineNo">955</span>      }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    }<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.958"></a>
-<span class="sourceLineNo">959</span>        justification = "This is what we want")<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    public void evict() {<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      synchronized (this) {<a name="line.961"></a>
-<span class="sourceLineNo">962</span>        this.notifyAll();<a name="line.962"></a>
-<span class="sourceLineNo">963</span>      }<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    }<a name="line.964"></a>
-<span class="sourceLineNo">965</span><a name="line.965"></a>
-<span class="sourceLineNo">966</span>    synchronized void shutdown() {<a name="line.966"></a>
-<span class="sourceLineNo">967</span>      this.go = false;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>      this.notifyAll();<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    }<a name="line.969"></a>
-<span class="sourceLineNo">970</span><a name="line.970"></a>
-<span class="sourceLineNo">971</span>    public boolean isGo() {<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      return go;<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    }<a name="line.973"></a>
-<span class="sourceLineNo">974</span><a name="line.974"></a>
-<span class="sourceLineNo">975</span>    /**<a name="line.975"></a>
-<span class="sourceLineNo">976</span>     * Used for the test.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>     */<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    boolean isEnteringRun() {<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      return this.enteringRun;<a name="line.979"></a>
-<span class="sourceLineNo">980</span>    }<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  }<a name="line.981"></a>
-<span class="sourceLineNo">982</span><a name="line.982"></a>
-<span class="sourceLineNo">983</span>  /*<a name="line.983"></a>
-<span class="sourceLineNo">984</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.984"></a>
-<span class="sourceLineNo">985</span>   */<a name="line.985"></a>
-<span class="sourceLineNo">986</span>  static class StatisticsThread extends Thread {<a name="line.986"></a>
-<span class="sourceLineNo">987</span><a name="line.987"></a>
-<span class="sourceLineNo">988</span>    private final LruBlockCache lru;<a name="line.988"></a>
-<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      super("LruBlockCacheStats");<a name="line.991"></a>
-<span class="sourceLineNo">992</span>      setDaemon(true);<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      this.lru = lru;<a name="line.993"></a>
+<span class="sourceLineNo">911</span>  @Override<a name="line.911"></a>
+<span class="sourceLineNo">912</span>  public long getBlockCount() {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    return this.elements.get();<a name="line.913"></a>
+<span class="sourceLineNo">914</span>  }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>  @Override<a name="line.916"></a>
+<span class="sourceLineNo">917</span>  public long getDataBlockCount() {<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    return this.dataBlockElements.sum();<a name="line.918"></a>
+<span class="sourceLineNo">919</span>  }<a name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>  public long getIndexBlockCount() {<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    return this.indexBlockElements.sum();<a name="line.922"></a>
+<span class="sourceLineNo">923</span>  }<a name="line.923"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span>  public long getBloomBlockCount() {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    return this.bloomBlockElements.sum();<a name="line.926"></a>
+<span class="sourceLineNo">927</span>  }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>  EvictionThread getEvictionThread() {<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    return this.evictionThread;<a name="line.930"></a>
+<span class="sourceLineNo">931</span>  }<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>  /*<a name="line.933"></a>
+<span class="sourceLineNo">934</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   * LruBlockCache#runEviction()}<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   */<a name="line.937"></a>
+<span class="sourceLineNo">938</span>  static class EvictionThread extends Thread {<a name="line.938"></a>
+<span class="sourceLineNo">939</span><a name="line.939"></a>
+<span class="sourceLineNo">940</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    private volatile boolean go = true;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // flag set after enter the run method, used for test<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    private boolean enteringRun = false;<a name="line.943"></a>
+<span class="sourceLineNo">944</span><a name="line.944"></a>
+<span class="sourceLineNo">945</span>    public EvictionThread(LruBlockCache cache) {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      setDaemon(true);<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    }<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>    @Override<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    public void run() {<a name="line.952"></a>
+<span class="sourceLineNo">953</span>      enteringRun = true;<a name="line.953"></a>
+<span class="sourceLineNo">954</span>      while (this.go) {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>        synchronized (this) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>          try {<a name="line.956"></a>
+<span class="sourceLineNo">957</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.957"></a>
+<span class="sourceLineNo">958</span>          } catch (InterruptedException e) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.959"></a>
+<span class="sourceLineNo">960</span>            Thread.currentThread().interrupt();<a name="line.960"></a>
+<span class="sourceLineNo">961</span>          }<a name="line.961"></a>
+<span class="sourceLineNo">962</span>        }<a name="line.962"></a>
+<span class="sourceLineNo">963</span>        LruBlockCache cache = this.cache.get();<a name="line.963"></a>
+<span class="sourceLineNo">964</span>        if (cache == null) {<a name="line.964"></a>
+<span class="sourceLineNo">965</span>          this.go = false;<a name="line.965"></a>
+<span class="sourceLineNo">966</span>          break;<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        }<a name="line.967"></a>
+<span class="sourceLineNo">968</span>        cache.evict();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      }<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        justification = "This is what we want")<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    public void evict() {<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      synchronized (this) {<a name="line.975"></a>
+<span class="sourceLineNo">976</span>        this.notifyAll();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      }<a name="line.977"></a>
+<span class="sourceLineNo">978</span>    }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>    synchronized void shutdown() {<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      this.go = false;<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      this.notifyAll();<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    public boolean isGo() {<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      return go;<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span><a name="line.988"></a>
+<span class="sourceLineNo">989</span>    /**<a name="line.989"></a>
+<span class="sourceLineNo">990</span>     * Used for the test.<a name="line.990"></a>
+<span class="sourceLineNo">991</span>     */<a name="line.991"></a>
+<span class="sourceLineNo">992</span>    boolean isEnteringRun() {<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      return this.enteringRun;<a name="line.993"></a>
 <span class="sourceLineNo">994</span>    }<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>    @Override<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    public void run() {<a name="line.997"></a>
-<span class="sourceLineNo">998</span>      lru.logStats();<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    }<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>  }<a name="line.1000"></a>
+<span class="sourceLineNo">995</span>  }<a name="line.995"></a>
+<span class="sourceLineNo">996</span><a name="line.996"></a>
+<span class="sourceLineNo">997</span>  /*<a name="line.997"></a>
+<span class="sourceLineNo">998</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>   */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>  static class StatisticsThread extends Thread {<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span><a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>  public void logStats() {<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    // Log size<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    long totalSize = heapSize();<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    long freeSize = maxSize - totalSize;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>      + (stats.getHitCount() == 0<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>        ? "0"<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      + (stats.getHitCachingCount() == 0<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>        ? "0,"<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  }<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span><a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>  /**<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>   * Get counter statistics for this cache.<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   * &lt;p&gt;<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>   */<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>  @Override<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>  public CacheStats getStats() {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    return this.stats;<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>  }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span><a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span><a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>  @Override<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  public long heapSize() {<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    return getCurrentSize();<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>  }<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span><a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  }<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>  @Override<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>      private final long now = System.nanoTime();<a name="line.1052"></a>
+<span class="sourceLineNo">1002</span>    private final LruBlockCache lru;<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span><a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>      super("LruBlockCacheStats");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>      setDaemon(true);<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>      this.lru = lru;<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    }<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span><a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    @Override<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    public void run() {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      lru.logStats();<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>    }<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>  }<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span><a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>  public void logStats() {<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>    // Log size<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>    long totalSize = heapSize();<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>    long freeSize = maxSize - totalSize;<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      + (stats.getHitCount() == 0<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>        ? "0"<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>      + (stats.getHitCachingCount() == 0<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>        ? "0,"<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span><a name="line.1035"></a>
+<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>   * Get counter statistics for this cache.<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>   * &lt;p&gt;<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>   */<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>  @Override<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>  public CacheStats getStats() {<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    return this.stats;<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>  }<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span><a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span><a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>  @Override<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>  public long heapSize() {<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    return getCurrentSize();<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>      @Override<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>      public boolean hasNext() {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>        return iterator.hasNext();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>      }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>      @Override<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      public CachedBlock next() {<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        final LruCachedBlock b = iterator.next();<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        return new CachedBlock() {<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>          @Override<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>          public String toString() {<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>            return BlockCacheUtil.toString(this, now);<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>          }<a name="line.1066"></a>
+<span class="sourceLineNo">1054</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>  }<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span><a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  @Override<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span><a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>      private final long now = System.nanoTime();<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span><a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>          @Override<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>          public BlockPriority getBlockPriority() {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>            return b.getPriority();<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>          }<a name="line.1071"></a>
+<span class="sourceLineNo">1068</span>      @Override<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>      public boolean hasNext() {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>        return iterator.hasNext();<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>      }<a name="line.1071"></a>
 <span class="sourceLineNo">1072</span><a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>          @Override<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>          public BlockType getBlockType() {<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>            return b.getBuffer().getBlockType();<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>          }<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span><a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>          @Override<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>          public long getOffset() {<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>            return b.getCacheKey().getOffset();<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>          }<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span><a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>          @Override<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>          public long getSize() {<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>            return b.getBuffer().heapSize();<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>          }<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span><a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>          @Override<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>          public long getCachedTime() {<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>            return b.getCachedTime();<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>          }<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span><a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          @Override<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          public String getFilename() {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            return b.getCacheKey().getHfileName();<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          }<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span><a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          @Override<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>          public int compareTo(CachedBlock other) {<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>            if (diff != 0) {<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>              return diff;<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>            }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>            if (diff != 0) {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>              return diff;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>            }<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>            }<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>          }<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span><a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>          @Override<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>          public int hashCode() {<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>            return b.hashCode();<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>          }<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span><a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>          @Override<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>          public boolean equals(Object obj) {<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>            if (obj instanceof CachedBlock) {<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>              return compareTo(cb) == 0;<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>            } else {<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>              return false;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>            }<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>          }<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>        };<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>      }<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span><a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>      @Override<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>      public void remove() {<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>        throw new UnsupportedOperationException();<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>      }<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    };<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>  }<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span><a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span><a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>  long acceptableSize() {<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>  }<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span><a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>  private long minSize() {<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>  }<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>  private long singleSize() {<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1149"></a>
+<span class="sourceLineNo">1073</span>      @Override<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>      public CachedBlock next() {<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>        final LruCachedBlock b = iterator.next();<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>        return new CachedBlock() {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>          @Override<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>          public String toString() {<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>            return BlockCacheUtil.toString(this, now);<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>          }<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span><a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>          @Override<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>          public BlockPriority getBlockPriority() {<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>            return b.getPriority();<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>          }<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span><a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>          @Override<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>          public BlockType getBlockType() {<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>            return b.getBuffer().getBlockType();<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>          }<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span><a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>          @Override<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>          public long getOffset() {<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>            return b.getCacheKey().getOffset();<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>          }<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span><a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>          @Override<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>          public long getSize() {<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>            return b.getBuffer().heapSize();<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>          }<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>          @Override<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>          public long getCachedTime() {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>            return b.getCachedTime();<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>          }<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span><a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>          @Override<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>          public String getFilename() {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>            return b.getCacheKey().getHfileName();<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          }<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span><a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          @Override<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>          public int compareTo(CachedBlock other) {<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            if (diff != 0) {<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>              return diff;<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>            }<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>            if (diff != 0) {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>              return diff;<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>            }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>            }<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>          }<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span><a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>          @Override<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>          public int hashCode() {<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>            return b.hashCode();<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>          }<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span><a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>          @Override<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>          public boolean equals(Object obj) {<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>            if (obj instanceof CachedBlock) {<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>              return compareTo(cb) == 0;<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>            } else {<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>              return false;<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>            }<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>          }<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>        };<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>      }<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span><a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>      @Override<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>      public void remove() {<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>        throw new UnsupportedOperationException();<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span>      }<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>    };<a name="line.1149"></a>
 <span class="sourceLineNo">1150</span>  }<a name="line.1150"></a>
 <span class="sourceLineNo">1151</span><a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>  private long multiSize() {<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>  }<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span><a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>  private long memorySize() {<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>  }<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span><a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>  @Override<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>  public void shutdown() {<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>    if (victimHandler != null) {<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>      victimHandler.shutdown();<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>    }<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>    this.scheduleThreadPool.shutdown();<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>        try {<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>          Thread.sleep(10);<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>        } catch (InterruptedException e) {<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>          LOG.warn("Interrupted while sleeping");<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>          Thread.currentThread().interrupt();<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>          break;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>        }<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>      }<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    }<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span><a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>      LOG.debug("Still running " + runnables);<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>    }<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    this.evictionThread.shutdown();<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>  }<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>  /** Clears the cache. Used in tests. */<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>  public void clearCache() {<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>    this.map.clear();<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    this.elements.set(0);<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>  }<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span><a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>  /**<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>   * Used in testing. May be very inefficient.<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>   * @return the set of cached file names<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>   */<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    }<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    return fileNames;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>  }<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span><a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    for (LruCachedBlock block : map.values()) {<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>      Integer count = counts.get(encoding);<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    }<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    return counts;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>  }<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span><a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>    return map;<a name="line.1214"></a>
+<span class="sourceLineNo">1152</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span><a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>  long acceptableSize() {<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>  }<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span><a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>  private long minSize() {<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>  }<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>  private long singleSize() {<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>  }<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span><a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>  private long multiSize() {<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>  }<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>  private long memorySize() {<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>  }<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span><a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>  @Override<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>  public void shutdown() {<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>    if (victimHandler != null) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>      victimHandler.shutdown();<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>    }<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>    this.scheduleThreadPool.shutdown();<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>        try {<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>          Thread.sleep(10);<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span>        } catch (InterruptedException e) {<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span>          LOG.warn("Interrupted while sleeping");<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>          Thread.currentThread().interrupt();<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span>          break;<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>        }<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>      }<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span>    }<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span><a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>      LOG.debug("Still running " + runnables);<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>    }<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span>    this.evictionThread.shutdown();<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>  }<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span><a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>  /** Clears the cache. Used in tests. */<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span>  public void clearCache() {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>    this.map.clear();<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>    this.elements.set(0);<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>  }<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span><a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>  /**<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>   * Used in testing. May be very inefficient.<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span>   * @return the set of cached file names<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>   */<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span>    }<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>    return fileNames;<a name="line.1214"></a>
 <span class="sourceLineNo">1215</span>  }<a name="line.1215"></a>
 <span class="sourceLineNo">1216</span><a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>  @Override<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>  public BlockCache[] getBlockCaches() {<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>    if (victimHandler != null) {<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>    }<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>    return null;<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>  }<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>}<a name="line.1224"></a>
+<span class="sourceLineNo">1217</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>    for (LruCachedBlock block : map.values()) {<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>      Integer count = counts.get(encoding);<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>    }<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>    return counts;<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>  }<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span><a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>    return map;<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span>  }<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span><a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>  @Override<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>  public BlockCache[] getBlockCaches() {<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>    if (victimHandler != null) {<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>    }<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span>    return null;<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>  }<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>}<a name="line.1238"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
index da165dc..ed10198 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.StatisticsThread.html
@@ -42,1194 +42,1208 @@
 <span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import java.util.concurrent.atomic.LongAdder;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.conf.Configuration;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.util.StringUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * operations.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;/p&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * least-frequently-used element to the eviction algorithm.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * &lt;p/&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * chunk the others are able to grow beyond their chunk size.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * &lt;p/&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;p/&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * thread.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;p/&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * &lt;p/&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * sizes and usage.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>@InterfaceAudience.Private<a name="line.87"></a>
-<span class="sourceLineNo">088</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    "hbase.lru.blockcache.single.percentage";<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * is a cluster-wide configuration<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /* Default Configuration Parameters */<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  /* Backing Concurrent Map Configuration */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  /* Eviction thresholds */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /* Priority buckets */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /* Statistics thread */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#computeIfPresent<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * (key, func). Besides, the func method must execute exactly once only when the key is present<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * and under the lock context, otherwise the reference count will be messed up. Notice that the<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  /** Eviction lock (locked when eviction in process) */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.158"></a>
+<span class="sourceLineNo">037</span>import org.apache.commons.lang3.mutable.MutableBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.util.StringUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * operations.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;/p&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * least-frequently-used element to the eviction algorithm.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * &lt;p/&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * chunk the others are able to grow beyond their chunk size.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * &lt;p/&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p/&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * thread.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * &lt;p/&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * &lt;p/&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * sizes and usage.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>@InterfaceAudience.Private<a name="line.88"></a>
+<span class="sourceLineNo">089</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    "hbase.lru.blockcache.single.percentage";<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * is a cluster-wide configuration<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  /* Default Configuration Parameters */<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /* Backing Concurrent Map Configuration */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  /* Eviction thresholds */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /* Priority buckets */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  /* Statistics thread */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  /**<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#k (key, func).<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * Besides, the func method must execute exactly once only when the key is present and under the<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * lock context, otherwise the reference count will be messed up. Notice that the<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that. Some code using<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * #computeIfPresent also expects the supplier to be executed only once. ConcurrentHashMap can<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * guarantee that. Other types may not.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  private final long maxBlockSize;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  private volatile boolean evictionInProgress = false;<a name="line.163"></a>
+<span class="sourceLineNo">160</span>  /** Eviction lock (locked when eviction in process) */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private final long maxBlockSize;<a name="line.163"></a>
 <span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /** Eviction thread */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  private transient final EvictionThread evictionThread;<a name="line.166"></a>
+<span class="sourceLineNo">165</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  private volatile boolean evictionInProgress = false;<a name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /** Current size of cache */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private final AtomicLong size;<a name="line.174"></a>
+<span class="sourceLineNo">168</span>  /** Eviction thread */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private transient final EvictionThread evictionThread;<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.174"></a>
 <span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  /** Current size of data blocks */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.177"></a>
+<span class="sourceLineNo">176</span>  /** Current size of cache */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  private final AtomicLong size;<a name="line.177"></a>
 <span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  /** Current size of index blocks */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.180"></a>
+<span class="sourceLineNo">179</span>  /** Current size of data blocks */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.180"></a>
 <span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /** Current size of bloom blocks */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.183"></a>
+<span class="sourceLineNo">182</span>  /** Current size of index blocks */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.183"></a>
 <span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  /** Current number of cached elements */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private final AtomicLong elements;<a name="line.186"></a>
+<span class="sourceLineNo">185</span>  /** Current size of bloom blocks */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  /** Current number of cached data block elements */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.189"></a>
+<span class="sourceLineNo">188</span>  /** Current number of cached elements */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  private final AtomicLong elements;<a name="line.189"></a>
 <span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /** Current number of cached index block elements */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.192"></a>
+<span class="sourceLineNo">191</span>  /** Current number of cached data block elements */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.192"></a>
 <span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  /** Current number of cached bloom block elements */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.195"></a>
+<span class="sourceLineNo">194</span>  /** Current number of cached index block elements */<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.195"></a>
 <span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /** Cache access count (sequential ID) */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private final AtomicLong count;<a name="line.198"></a>
+<span class="sourceLineNo">197</span>  /** Current number of cached bloom block elements */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /** hard capacity limit */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  private float hardCapacityLimitFactor;<a name="line.201"></a>
+<span class="sourceLineNo">200</span>  /** Cache access count (sequential ID) */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  private final AtomicLong count;<a name="line.201"></a>
 <span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  /** Cache statistics */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  private final CacheStats stats;<a name="line.204"></a>
+<span class="sourceLineNo">203</span>  /** hard capacity limit */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private float hardCapacityLimitFactor;<a name="line.204"></a>
 <span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  private long maxSize;<a name="line.207"></a>
+<span class="sourceLineNo">206</span>  /** Cache statistics */<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  private final CacheStats stats;<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /** Approximate block size */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  private long blockSize;<a name="line.210"></a>
+<span class="sourceLineNo">209</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  private long maxSize;<a name="line.210"></a>
 <span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  private float acceptableFactor;<a name="line.213"></a>
+<span class="sourceLineNo">212</span>  /** Approximate block size */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  private long blockSize;<a name="line.213"></a>
 <span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  private float minFactor;<a name="line.216"></a>
+<span class="sourceLineNo">215</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  private float acceptableFactor;<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  /** Single access bucket size */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  private float singleFactor;<a name="line.219"></a>
+<span class="sourceLineNo">218</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  private float minFactor;<a name="line.219"></a>
 <span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /** Multiple access bucket size */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private float multiFactor;<a name="line.222"></a>
+<span class="sourceLineNo">221</span>  /** Single access bucket size */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  private float singleFactor;<a name="line.222"></a>
 <span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>  /** In-memory bucket size */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  private float memoryFactor;<a name="line.225"></a>
+<span class="sourceLineNo">224</span>  /** Multiple access bucket size */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  private float multiFactor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** Overhead of the structure itself */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  private long overhead;<a name="line.228"></a>
+<span class="sourceLineNo">227</span>  /** In-memory bucket size */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private float memoryFactor;<a name="line.228"></a>
 <span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  private boolean forceInMemory;<a name="line.231"></a>
+<span class="sourceLineNo">230</span>  /** Overhead of the structure itself */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private long overhead;<a name="line.231"></a>
 <span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  private transient BlockCache victimHandler = null;<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * fine).<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param blockSize approximate size of each block, in bytes<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    this(maxSize, blockSize, true);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    this(maxSize, blockSize, true, conf);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    this.maxBlockSize = maxBlockSize;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    if (<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        || memoryFactor &lt; 0<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    ) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      throw new IllegalArgumentException(<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.305"></a>
+<span class="sourceLineNo">233</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  private boolean forceInMemory;<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>  /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  private transient BlockCache victimHandler = null;<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * fine).<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * &lt;p&gt;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param blockSize approximate size of each block, in bytes<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    this(maxSize, blockSize, true);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    this(maxSize, blockSize, true, conf);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    this.maxBlockSize = maxBlockSize;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    if (<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        || memoryFactor &lt; 0<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    ) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      throw new IllegalArgumentException(<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.305"></a>
 <span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.308"></a>
+<span class="sourceLineNo">307</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    this.maxSize = maxSize;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    this.blockSize = blockSize;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    this.forceInMemory = forceInMemory;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    this.minFactor = minFactor;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    this.acceptableFactor = acceptableFactor;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    this.singleFactor = singleFactor;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    this.multiFactor = multiFactor;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    this.memoryFactor = memoryFactor;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    this.count = new AtomicLong(0);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    this.elements = new AtomicLong(0);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    this.size = new AtomicLong(this.overhead);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    if (evictionThread) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      this.evictionThread = new EvictionThread(this);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      this.evictionThread = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    // every five minutes.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    if (victimHandler != null) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    victimHandler = requireNonNull(victimCache);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  public void setMaxSize(long maxSize) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.maxSize = maxSize;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      runEviction();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>  /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * JVM, so need a retain here.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @param buf the original block<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * @return an block with an heap memory backend.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    if (buf instanceof HFileBlock) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      if (blk.isSharedMem()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return buf.retain();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  // BlockCache implementation<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Cache the block with the specified name and buffer.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   * &lt;p&gt;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * this can happen, for which we compare the buffer contents.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param cacheKey block's cache key<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @param buf      block buffer<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param inMemory if block is in-memory<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   */<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  @Override<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      // If there are a lot of blocks that are too<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      // big this can make the logs way too noisy.<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      // So we log 2%<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (stats.failInsert() % 50 == 0) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          + maxBlockSize);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      return;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    long currentSize = size.get();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    long currentAcceptableSize = acceptableSize();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      stats.failInsert();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (LOG.isTraceEnabled()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      if (!evictionInProgress) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        runEviction();<a name="line.420"></a>
+<span class="sourceLineNo">310</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    this.maxSize = maxSize;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    this.blockSize = blockSize;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    this.forceInMemory = forceInMemory;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    this.minFactor = minFactor;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    this.acceptableFactor = acceptableFactor;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    this.singleFactor = singleFactor;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    this.multiFactor = multiFactor;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    this.memoryFactor = memoryFactor;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    this.count = new AtomicLong(0);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    this.elements = new AtomicLong(0);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    this.size = new AtomicLong(this.overhead);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    if (evictionThread) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      this.evictionThread = new EvictionThread(this);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.evictionThread = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    // every five minutes.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (victimHandler != null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    victimHandler = requireNonNull(victimCache);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void setMaxSize(long maxSize) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.maxSize = maxSize;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      runEviction();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>  /**<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   * JVM, so need a retain here.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   * @param buf the original block<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * @return an block with an heap memory backend.<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   */<a name="line.370"></a>
+<span class="sourceLineNo">371</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (buf instanceof HFileBlock) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      if (blk.isSharedMem()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    return buf.retain();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>  // BlockCache implementation<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Cache the block with the specified name and buffer.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * &lt;p&gt;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * this can happen, for which we compare the buffer contents.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param cacheKey block's cache key<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param buf      block buffer<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param inMemory if block is in-memory<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  @Override<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      // If there are a lot of blocks that are too<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // big this can make the logs way too noisy.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      // So we log 2%<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      if (stats.failInsert() % 50 == 0) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          + maxBlockSize);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      return;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    long currentSize = size.get();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    long currentAcceptableSize = acceptableSize();<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      stats.failInsert();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      if (LOG.isTraceEnabled()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.420"></a>
 <span class="sourceLineNo">421</span>      }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      return;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // Ensure that the block is an heap one.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    buf = asReferencedHeapBlock(buf);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    map.put(cacheKey, cb);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    long val = elements.incrementAndGet();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (buf.getBlockType().isBloom()) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      bloomBlockElements.increment();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      indexBlockElements.increment();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    } else if (buf.getBlockType().isData()) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      dataBlockElements.increment();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    if (LOG.isTraceEnabled()) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      long size = map.size();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      assertCounterSanity(size, val);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      runEviction();<a name="line.442"></a>
+<span class="sourceLineNo">422</span>      if (!evictionInProgress) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        runEviction();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    // Ensure that the block is an heap one.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    buf = asReferencedHeapBlock(buf);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    map.put(cacheKey, cb);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    long val = elements.incrementAndGet();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    if (buf.getBlockType().isBloom()) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      bloomBlockElements.increment();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      indexBlockElements.increment();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    } else if (buf.getBlockType().isData()) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      dataBlockElements.increment();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    if (LOG.isTraceEnabled()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      long size = map.size();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      assertCounterSanity(size, val);<a name="line.442"></a>
 <span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>  /**<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * use with TRACE level logging and -ea JVM.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    if (counterVal &lt; 0) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        + ", mapSize=" + mapSize);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (pct_diff &gt; 0.05) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.459"></a>
-<span class="sourceLineNo">460</span>          + ", mapSize=" + mapSize);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>  /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * Cache the block with the specified name and buffer.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   * &lt;p&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   * otherwise the caching size is based on off-heap.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * @param cacheKey block's cache key<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * @param buf      block buffer<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    cacheBlock(cacheKey, buf, false);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   */<a name="line.483"></a>
-<span class="sourceLineNo">484</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    long heapsize = cb.heapSize();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (evict) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      heapsize *= -1;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    if (bt != null) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (bt.isBloom()) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        bloomBlockSize.add(heapsize);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      } else if (bt.isIndex()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        indexBlockSize.add(heapsize);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      } else if (bt.isData()) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        dataBlockSize.add(heapsize);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    return size.addAndGet(heapsize);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * Get the buffer of the block with the specified name.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * @param cacheKey           block's cache key<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   *                           double counting cache misses when doing double-check locking)<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    boolean updateCacheMetrics) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      // see HBASE-22422.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      val.getBuffer().retain();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      return val;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    });<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    if (cb == null) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      // If there is another block cache then try and read there.<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      // However if this is a retry ( second time in double checked locking )<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        // Promote this to L1.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        if (result != null) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>          if (caching) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>          }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return result;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      }<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return null;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    if (updateCacheMetrics) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    cb.access(count.incrementAndGet());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    return cb.getBuffer();<a name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * Whether the cache contains block with specified cacheKey<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * @return true if contains the block<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  @Override<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    return map.containsKey(cacheKey);<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  @Override<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>  }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>  /**<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   * log-access-time map.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   * &lt;p&gt;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.569"></a>
-<span class="sourceLineNo">570</span>   * @return the number of blocks evicted<a name="line.570"></a>
-<span class="sourceLineNo">571</span>   */<a name="line.571"></a>
-<span class="sourceLineNo">572</span>  @Override<a name="line.572"></a>
-<span class="sourceLineNo">573</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    int numEvicted = 0;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        if (evictBlock(key)) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          ++numEvicted;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    if (victimHandler != null) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    return numEvicted;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * read again later<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @return the heap size of evicted block<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   */<a name="line.593"></a>
-<span class="sourceLineNo">594</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    LruCachedBlock previous = map.remove(block.getCacheKey());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    if (previous == null) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return 0;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    updateSizeMetrics(block, true);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    long val = elements.decrementAndGet();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    if (LOG.isTraceEnabled()) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      long size = map.size();<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      assertCounterSanity(size, val);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    if (bt.isBloom()) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      bloomBlockElements.decrement();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    } else if (bt.isIndex()) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      indexBlockElements.decrement();<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    } else if (bt.isData()) {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      dataBlockElements.decrement();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    if (evictedByEvictionProcess) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      // update the stats counter.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      if (victimHandler != null) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        victimHandler.cacheBlock(block.getCacheKey(), block.getBuffer());<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    // NOT move this up because if do that then the victimHandler may access the buffer with<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    // refCnt = 0 which is disallowed.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    previous.getBuffer().release();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    return block.heapSize();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>  /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   * Multi-threaded call to run the eviction process.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   */<a name="line.630"></a>
-<span class="sourceLineNo">631</span>  private void runEviction() {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      evict();<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    } else {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      evictionThread.evict();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>  }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>  boolean isEvictionInProgress() {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    return evictionInProgress;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>  long getOverhead() {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    return overhead;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>  /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   * Eviction method.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>   */<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  void evict() {<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>    // Ensure only one eviction at a time<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    if (!evictionLock.tryLock()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    }<a name="line.655"></a>
+<span class="sourceLineNo">444</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      runEviction();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * use with TRACE level logging and -ea JVM.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (counterVal &lt; 0) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        + ", mapSize=" + mapSize);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      if (pct_diff &gt; 0.05) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          + ", mapSize=" + mapSize);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   * Cache the block with the specified name and buffer.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   * &lt;p&gt;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   * otherwise the caching size is based on off-heap.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>   * @param cacheKey block's cache key<a name="line.475"></a>
+<span class="sourceLineNo">476</span>   * @param buf      block buffer<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   */<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  @Override<a name="line.478"></a>
+<span class="sourceLineNo">479</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    cacheBlock(cacheKey, buf, false);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
+<span class="sourceLineNo">484</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
+<span class="sourceLineNo">487</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    long heapsize = cb.heapSize();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    if (evict) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      heapsize *= -1;<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    if (bt != null) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (bt.isBloom()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        bloomBlockSize.add(heapsize);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      } else if (bt.isIndex()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        indexBlockSize.add(heapsize);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      } else if (bt.isData()) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>        dataBlockSize.add(heapsize);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    return size.addAndGet(heapsize);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>  /**<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   * Get the buffer of the block with the specified name.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   * @param cacheKey           block's cache key<a name="line.507"></a>
+<span class="sourceLineNo">508</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   *                           double counting cache misses when doing double-check locking)<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  @Override<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    boolean updateCacheMetrics) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      // see HBASE-22422.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      val.getBuffer().retain();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      return val;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    });<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    if (cb == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      // If there is another block cache then try and read there.<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      // However if this is a retry ( second time in double checked locking )<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        // Promote this to L1.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        if (result != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          if (caching) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        return result;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return null;<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    if (updateCacheMetrics) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    cb.access(count.incrementAndGet());<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    return cb.getBuffer();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>  }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>  /**<a name="line.553"></a>
+<span class="sourceLineNo">554</span>   * Whether the cache contains block with specified cacheKey<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * @return true if contains the block<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   */<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  @Override<a name="line.557"></a>
+<span class="sourceLineNo">558</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    return map.containsKey(cacheKey);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>  @Override<a name="line.562"></a>
+<span class="sourceLineNo">563</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>  }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>  /**<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   * log-access-time map.<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * &lt;p&gt;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   * @return the number of blocks evicted<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   */<a name="line.575"></a>
+<span class="sourceLineNo">576</span>  @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    int numEvicted = 0;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        if (evictBlock(key)) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          ++numEvicted;<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    if (victimHandler != null) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    return numEvicted;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * read again later<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @return the heap size of evicted block<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   */<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    final MutableBoolean evicted = new MutableBoolean(false);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    map.computeIfPresent(block.getCacheKey(), (k, v) -&gt; {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      // Run the victim handler before we remove the mapping in the L1 map. It must complete<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      // quickly because other removal or insertion operations can be blocked in the meantime.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (evictedByEvictionProcess &amp;&amp; victimHandler != null) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        victimHandler.cacheBlock(k, v.getBuffer());<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      // NOT move this up because if we do that then the victimHandler may access the buffer with<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      // refCnt = 0 which is disallowed.<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      v.getBuffer().release();<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      evicted.setTrue();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      // By returning null from the supplier we remove the mapping from the L1 map.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      return null;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    });<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    // If we didn't find anything to evict there is nothing more to do here.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    if (evicted.isFalse()) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return 0;<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    }<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    // We evicted the block so update L1 statistics.<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    updateSizeMetrics(block, true);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    long val = elements.decrementAndGet();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    if (LOG.isTraceEnabled()) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      long size = map.size();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      assertCounterSanity(size, val);<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    }<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (bt.isBloom()) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      bloomBlockElements.decrement();<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    } else if (bt.isIndex()) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      indexBlockElements.decrement();<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    } else if (bt.isData()) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      dataBlockElements.decrement();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    if (evictedByEvictionProcess) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      // update the stats counter.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    return block.heapSize();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
+<span class="sourceLineNo">643</span>   * Multi-threaded call to run the eviction process.<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
+<span class="sourceLineNo">645</span>  private void runEviction() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      evict();<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      evictionThread.evict();<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>  boolean isEvictionInProgress() {<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    return evictionInProgress;<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
 <span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    try {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      evictionInProgress = true;<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      long currentSize = this.size.get();<a name="line.659"></a>
-<span class="sourceLineNo">660</span>      long bytesToFree = currentSize - minSize();<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span>      if (LOG.isTraceEnabled()) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span>      if (bytesToFree &lt;= 0) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        return;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      }<a name="line.669"></a>
+<span class="sourceLineNo">657</span>  long getOverhead() {<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    return overhead;<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span>  /**<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * Eviction method.<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   */<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  void evict() {<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>    // Ensure only one eviction at a time<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    if (!evictionLock.tryLock()) {<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      return;<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
 <span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>      // Instantiate priority buckets<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.674"></a>
+<span class="sourceLineNo">671</span>    try {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      evictionInProgress = true;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      long currentSize = this.size.get();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      long bytesToFree = currentSize - minSize();<a name="line.674"></a>
 <span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>      // Scan entire map putting into appropriate buckets<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        switch (cachedBlock.getPriority()) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>          case SINGLE: {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>            bucketSingle.add(cachedBlock);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>            break;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>          }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>          case MULTI: {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>            bucketMulti.add(cachedBlock);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>            break;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>          }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>          case MEMORY: {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>            bucketMemory.add(cachedBlock);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            break;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>          }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>      long bytesFreed = 0;<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        long s = bucketSingle.totalSize();<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        long m = bucketMulti.totalSize();<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        if (bytesToFree &gt; (s + m)) {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.699"></a>
-<span class="sourceLineNo">700</span>          // so the single and multi buckets will be emptied<a name="line.700"></a>
-<span class="sourceLineNo">701</span>          bytesFreed = bucketSingle.free(s);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>          bytesFreed += bucketMulti.free(m);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>          if (LOG.isTraceEnabled()) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>            LOG.trace(<a name="line.704"></a>
-<span class="sourceLineNo">705</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.705"></a>
-<span class="sourceLineNo">706</span>          }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>          if (LOG.isTraceEnabled()) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            LOG.trace(<a name="line.709"></a>
-<span class="sourceLineNo">710</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        } else {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>          // this means no need to evict block in memory bucket,<a name="line.713"></a>
-<span class="sourceLineNo">714</span>          // and we try best to make the ratio between single-bucket and<a name="line.714"></a>
-<span class="sourceLineNo">715</span>          // multi-bucket is 1:2<a name="line.715"></a>
-<span class="sourceLineNo">716</span>          long bytesRemain = s + m - bytesToFree;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>          if (3 * s &lt;= bytesRemain) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            // single-bucket is small enough that no eviction happens for it<a name="line.718"></a>
-<span class="sourceLineNo">719</span>            // hence all eviction goes from multi-bucket<a name="line.719"></a>
-<span class="sourceLineNo">720</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            // hence all eviction goes from single-bucket<a name="line.723"></a>
-<span class="sourceLineNo">724</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>          } else {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>            // both buckets need to evict some blocks<a name="line.726"></a>
-<span class="sourceLineNo">727</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>            }<a name="line.730"></a>
-<span class="sourceLineNo">731</span>          }<a name="line.731"></a>
-<span class="sourceLineNo">732</span>        }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>        bucketQueue.add(bucketSingle);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        bucketQueue.add(bucketMulti);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        bucketQueue.add(bucketMemory);<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>        int remainingBuckets = bucketQueue.size();<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>        BlockBucket bucket;<a name="line.742"></a>
-<span class="sourceLineNo">743</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>          long overflow = bucket.overflow();<a name="line.744"></a>
-<span class="sourceLineNo">745</span>          if (overflow &gt; 0) {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>            long bucketBytesToFree =<a name="line.746"></a>
-<span class="sourceLineNo">747</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>          remainingBuckets--;<a name="line.750"></a>
-<span class="sourceLineNo">751</span>        }<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      }<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (LOG.isTraceEnabled()) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        long single = bucketSingle.totalSize();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        long multi = bucketMulti.totalSize();<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        long memory = bucketMemory.totalSize();<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        LOG.trace(<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.758"></a>
-<span class="sourceLineNo">759</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.759"></a>
-<span class="sourceLineNo">760</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.760"></a>
-<span class="sourceLineNo">761</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    } finally {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      stats.evict();<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      evictionInProgress = false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      evictionLock.unlock();<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>  }<a name="line.768"></a>
-<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span>  @Override<a name="line.770"></a>
-<span class="sourceLineNo">771</span>  public String toString() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.772"></a>
-<span class="sourceLineNo">773</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.774"></a>
-<span class="sourceLineNo">775</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      .toString();<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span>  /**<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.788"></a>
-<span class="sourceLineNo">789</span><a name="line.789"></a>
-<span class="sourceLineNo">790</span>    private final String name;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    private LruCachedBlockQueue queue;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    private long totalSize = 0;<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    private long bucketSize;<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      this.name = name;<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      this.bucketSize = bucketSize;<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      totalSize = 0;<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    }<a name="line.800"></a>
-<span class="sourceLineNo">801</span><a name="line.801"></a>
-<span class="sourceLineNo">802</span>    public void add(LruCachedBlock block) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      totalSize += block.heapSize();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      queue.add(block);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    public long free(long toFree) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (LOG.isTraceEnabled()) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      LruCachedBlock cb;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      long freedBytes = 0;<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      while ((cb = queue.pollLast()) != null) {<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        freedBytes += evictBlock(cb, true);<a name="line.814"></a>
-<span class="sourceLineNo">815</span>        if (freedBytes &gt;= toFree) {<a name="line.815"></a>
-<span class="sourceLineNo">816</span>          return freedBytes;<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        }<a name="line.817"></a>
-<span class="sourceLineNo">818</span>      }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      if (LOG.isTraceEnabled()) {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      }<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      return freedBytes;<a name="line.822"></a>
-<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span>    public long overflow() {<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      return totalSize - bucketSize;<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>    public long totalSize() {<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      return totalSize;<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span>    @Override<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    public int compareTo(BlockBucket that) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>    @Override<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    public boolean equals(Object that) {<a name="line.839"></a>
-<span class="sourceLineNo">840</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span>        return false;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>      }<a name="line.842"></a>
-<span class="sourceLineNo">843</span>      return compareTo((BlockBucket) that) == 0;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    }<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    @Override<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    public int hashCode() {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    }<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    @Override<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    public String toString() {<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.853"></a>
-<span class="sourceLineNo">854</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.854"></a>
-<span class="sourceLineNo">855</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    }<a name="line.856"></a>
-<span class="sourceLineNo">857</span>  }<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>  /**<a name="line.859"></a>
-<span class="sourceLineNo">860</span>   * Get the maximum size of this cache.<a name="line.860"></a>
-<span class="sourceLineNo">861</span>   * @return max size in bytes<a name="line.861"></a>
-<span class="sourceLineNo">862</span>   */<a name="line.862"></a>
-<span class="sourceLineNo">863</span><a name="line.863"></a>
-<span class="sourceLineNo">864</span>  @Override<a name="line.864"></a>
-<span class="sourceLineNo">865</span>  public long getMaxSize() {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    return this.maxSize;<a name="line.866"></a>
-<span class="sourceLineNo">867</span>  }<a name="line.867"></a>
-<span class="sourceLineNo">868</span><a name="line.868"></a>
-<span class="sourceLineNo">869</span>  @Override<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  public long getCurrentSize() {<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    return this.size.get();<a name="line.871"></a>
-<span class="sourceLineNo">872</span>  }<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>  @Override<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  public long getCurrentDataSize() {<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    return this.dataBlockSize.sum();<a name="line.876"></a>
-<span class="sourceLineNo">877</span>  }<a name="line.877"></a>
-<span class="sourceLineNo">878</span><a name="line.878"></a>
-<span class="sourceLineNo">879</span>  public long getCurrentIndexSize() {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    return this.indexBlockSize.sum();<a name="line.880"></a>
+<span class="sourceLineNo">676</span>      if (LOG.isTraceEnabled()) {<a name="line.676"></a>
+<span class="sourceLineNo">677</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.677"></a>
+<span class="sourceLineNo">678</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      }<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>      if (bytesToFree &lt;= 0) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        return;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>      // Instantiate priority buckets<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.686"></a>
+<span class="sourceLineNo">687</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>      // Scan entire map putting into appropriate buckets<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>        switch (cachedBlock.getPriority()) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span>          case SINGLE: {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            bucketSingle.add(cachedBlock);<a name="line.694"></a>
+<span class="sourceLineNo">695</span>            break;<a name="line.695"></a>
+<span class="sourceLineNo">696</span>          }<a name="line.696"></a>
+<span class="sourceLineNo">697</span>          case MULTI: {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>            bucketMulti.add(cachedBlock);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>            break;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>          }<a name="line.700"></a>
+<span class="sourceLineNo">701</span>          case MEMORY: {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>            bucketMemory.add(cachedBlock);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>            break;<a name="line.703"></a>
+<span class="sourceLineNo">704</span>          }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>        }<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>      long bytesFreed = 0;<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        long s = bucketSingle.totalSize();<a name="line.710"></a>
+<span class="sourceLineNo">711</span>        long m = bucketMulti.totalSize();<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        if (bytesToFree &gt; (s + m)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.713"></a>
+<span class="sourceLineNo">714</span>          // so the single and multi buckets will be emptied<a name="line.714"></a>
+<span class="sourceLineNo">715</span>          bytesFreed = bucketSingle.free(s);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>          bytesFreed += bucketMulti.free(m);<a name="line.716"></a>
+<span class="sourceLineNo">717</span>          if (LOG.isTraceEnabled()) {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>            LOG.trace(<a name="line.718"></a>
+<span class="sourceLineNo">719</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.719"></a>
+<span class="sourceLineNo">720</span>          }<a name="line.720"></a>
+<span class="sourceLineNo">721</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.721"></a>
+<span class="sourceLineNo">722</span>          if (LOG.isTraceEnabled()) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>            LOG.trace(<a name="line.723"></a>
+<span class="sourceLineNo">724</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.724"></a>
+<span class="sourceLineNo">725</span>          }<a name="line.725"></a>
+<span class="sourceLineNo">726</span>        } else {<a name="line.726"></a>
+<span class="sourceLineNo">727</span>          // this means no need to evict block in memory bucket,<a name="line.727"></a>
+<span class="sourceLineNo">728</span>          // and we try best to make the ratio between single-bucket and<a name="line.728"></a>
+<span class="sourceLineNo">729</span>          // multi-bucket is 1:2<a name="line.729"></a>
+<span class="sourceLineNo">730</span>          long bytesRemain = s + m - bytesToFree;<a name="line.730"></a>
+<span class="sourceLineNo">731</span>          if (3 * s &lt;= bytesRemain) {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>            // single-bucket is small enough that no eviction happens for it<a name="line.732"></a>
+<span class="sourceLineNo">733</span>            // hence all eviction goes from multi-bucket<a name="line.733"></a>
+<span class="sourceLineNo">734</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.736"></a>
+<span class="sourceLineNo">737</span>            // hence all eviction goes from single-bucket<a name="line.737"></a>
+<span class="sourceLineNo">738</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.738"></a>
+<span class="sourceLineNo">739</span>          } else {<a name="line.739"></a>
+<span class="sourceLineNo">740</span>            // both buckets need to evict some blocks<a name="line.740"></a>
+<span class="sourceLineNo">741</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.742"></a>
+<span class="sourceLineNo">743</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>            }<a name="line.744"></a>
+<span class="sourceLineNo">745</span>          }<a name="line.745"></a>
+<span class="sourceLineNo">746</span>        }<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      } else {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span>        bucketQueue.add(bucketSingle);<a name="line.750"></a>
+<span class="sourceLineNo">751</span>        bucketQueue.add(bucketMulti);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>        bucketQueue.add(bucketMemory);<a name="line.752"></a>
+<span class="sourceLineNo">753</span><a name="line.753"></a>
+<span class="sourceLineNo">754</span>        int remainingBuckets = bucketQueue.size();<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>        BlockBucket bucket;<a name="line.756"></a>
+<span class="sourceLineNo">757</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.757"></a>
+<span class="sourceLineNo">758</span>          long overflow = bucket.overflow();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>          if (overflow &gt; 0) {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>            long bucketBytesToFree =<a name="line.760"></a>
+<span class="sourceLineNo">761</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.761"></a>
+<span class="sourceLineNo">762</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.762"></a>
+<span class="sourceLineNo">763</span>          }<a name="line.763"></a>
+<span class="sourceLineNo">764</span>          remainingBuckets--;<a name="line.764"></a>
+<span class="sourceLineNo">765</span>        }<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>      if (LOG.isTraceEnabled()) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        long single = bucketSingle.totalSize();<a name="line.768"></a>
+<span class="sourceLineNo">769</span>        long multi = bucketMulti.totalSize();<a name="line.769"></a>
+<span class="sourceLineNo">770</span>        long memory = bucketMemory.totalSize();<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        LOG.trace(<a name="line.771"></a>
+<span class="sourceLineNo">772</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.773"></a>
+<span class="sourceLineNo">774</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.775"></a>
+<span class="sourceLineNo">776</span>      }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    } finally {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      stats.evict();<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      evictionInProgress = false;<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      evictionLock.unlock();<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  @Override<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  public String toString() {<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      .toString();<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
+<span class="sourceLineNo">796</span><a name="line.796"></a>
+<span class="sourceLineNo">797</span>  /**<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   */<a name="line.801"></a>
+<span class="sourceLineNo">802</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span>    private final String name;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>    private LruCachedBlockQueue queue;<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    private long totalSize = 0;<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    private long bucketSize;<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      this.name = name;<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      this.bucketSize = bucketSize;<a name="line.811"></a>
+<span class="sourceLineNo">812</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      totalSize = 0;<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span><a name="line.815"></a>
+<span class="sourceLineNo">816</span>    public void add(LruCachedBlock block) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      totalSize += block.heapSize();<a name="line.817"></a>
+<span class="sourceLineNo">818</span>      queue.add(block);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    }<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>    public long free(long toFree) {<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      if (LOG.isTraceEnabled()) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      }<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      LruCachedBlock cb;<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      long freedBytes = 0;<a name="line.826"></a>
+<span class="sourceLineNo">827</span>      while ((cb = queue.pollLast()) != null) {<a name="line.827"></a>
+<span class="sourceLineNo">828</span>        freedBytes += evictBlock(cb, true);<a name="line.828"></a>
+<span class="sourceLineNo">829</span>        if (freedBytes &gt;= toFree) {<a name="line.829"></a>
+<span class="sourceLineNo">830</span>          return freedBytes;<a name="line.830"></a>
+<span class="sourceLineNo">831</span>        }<a name="line.831"></a>
+<span class="sourceLineNo">832</span>      }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>      if (LOG.isTraceEnabled()) {<a name="line.833"></a>
+<span class="sourceLineNo">834</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      }<a name="line.835"></a>
+<span class="sourceLineNo">836</span>      return freedBytes;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    }<a name="line.837"></a>
+<span class="sourceLineNo">838</span><a name="line.838"></a>
+<span class="sourceLineNo">839</span>    public long overflow() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      return totalSize - bucketSize;<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    }<a name="line.841"></a>
+<span class="sourceLineNo">842</span><a name="line.842"></a>
+<span class="sourceLineNo">843</span>    public long totalSize() {<a name="line.843"></a>
+<span class="sourceLineNo">844</span>      return totalSize;<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    }<a name="line.845"></a>
+<span class="sourceLineNo">846</span><a name="line.846"></a>
+<span class="sourceLineNo">847</span>    @Override<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    public int compareTo(BlockBucket that) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    }<a name="line.850"></a>
+<span class="sourceLineNo">851</span><a name="line.851"></a>
+<span class="sourceLineNo">852</span>    @Override<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    public boolean equals(Object that) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>        return false;<a name="line.855"></a>
+<span class="sourceLineNo">856</span>      }<a name="line.856"></a>
+<span class="sourceLineNo">857</span>      return compareTo((BlockBucket) that) == 0;<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    }<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span>    @Override<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    public int hashCode() {<a name="line.861"></a>
+<span class="sourceLineNo">862</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    }<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>    @Override<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    public String toString() {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.867"></a>
+<span class="sourceLineNo">868</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.868"></a>
+<span class="sourceLineNo">869</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.869"></a>
+<span class="sourceLineNo">870</span>    }<a name="line.870"></a>
+<span class="sourceLineNo">871</span>  }<a name="line.871"></a>
+<span class="sourceLineNo">872</span><a name="line.872"></a>
+<span class="sourceLineNo">873</span>  /**<a name="line.873"></a>
+<span class="sourceLineNo">874</span>   * Get the maximum size of this cache.<a name="line.874"></a>
+<span class="sourceLineNo">875</span>   * @return max size in bytes<a name="line.875"></a>
+<span class="sourceLineNo">876</span>   */<a name="line.876"></a>
+<span class="sourceLineNo">877</span><a name="line.877"></a>
+<span class="sourceLineNo">878</span>  @Override<a name="line.878"></a>
+<span class="sourceLineNo">879</span>  public long getMaxSize() {<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    return this.maxSize;<a name="line.880"></a>
 <span class="sourceLineNo">881</span>  }<a name="line.881"></a>
 <span class="sourceLineNo">882</span><a name="line.882"></a>
-<span class="sourceLineNo">883</span>  public long getCurrentBloomSize() {<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    return this.bloomBlockSize.sum();<a name="line.884"></a>
-<span class="sourceLineNo">885</span>  }<a name="line.885"></a>
-<span class="sourceLineNo">886</span><a name="line.886"></a>
-<span class="sourceLineNo">887</span>  @Override<a name="line.887"></a>
-<span class="sourceLineNo">888</span>  public long getFreeSize() {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    return getMaxSize() - getCurrentSize();<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  }<a name="line.890"></a>
-<span class="sourceLineNo">891</span><a name="line.891"></a>
-<span class="sourceLineNo">892</span>  @Override<a name="line.892"></a>
-<span class="sourceLineNo">893</span>  public long size() {<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    return getMaxSize();<a name="line.894"></a>
+<span class="sourceLineNo">883</span>  @Override<a name="line.883"></a>
+<span class="sourceLineNo">884</span>  public long getCurrentSize() {<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    return this.size.get();<a name="line.885"></a>
+<span class="sourceLineNo">886</span>  }<a name="line.886"></a>
+<span class="sourceLineNo">887</span><a name="line.887"></a>
+<span class="sourceLineNo">888</span>  @Override<a name="line.888"></a>
+<span class="sourceLineNo">889</span>  public long getCurrentDataSize() {<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    return this.dataBlockSize.sum();<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  public long getCurrentIndexSize() {<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    return this.indexBlockSize.sum();<a name="line.894"></a>
 <span class="sourceLineNo">895</span>  }<a name="line.895"></a>
 <span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  @Override<a name="line.897"></a>
-<span class="sourceLineNo">898</span>  public long getBlockCount() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    return this.elements.get();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>  }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>  @Override<a name="line.902"></a>
-<span class="sourceLineNo">903</span>  public long getDataBlockCount() {<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    return this.dataBlockElements.sum();<a name="line.904"></a>
-<span class="sourceLineNo">905</span>  }<a name="line.905"></a>
-<span class="sourceLineNo">906</span><a name="line.906"></a>
-<span class="sourceLineNo">907</span>  public long getIndexBlockCount() {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    return this.indexBlockElements.sum();<a name="line.908"></a>
+<span class="sourceLineNo">897</span>  public long getCurrentBloomSize() {<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    return this.bloomBlockSize.sum();<a name="line.898"></a>
+<span class="sourceLineNo">899</span>  }<a name="line.899"></a>
+<span class="sourceLineNo">900</span><a name="line.900"></a>
+<span class="sourceLineNo">901</span>  @Override<a name="line.901"></a>
+<span class="sourceLineNo">902</span>  public long getFreeSize() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    return getMaxSize() - getCurrentSize();<a name="line.903"></a>
+<span class="sourceLineNo">904</span>  }<a name="line.904"></a>
+<span class="sourceLineNo">905</span><a name="line.905"></a>
+<span class="sourceLineNo">906</span>  @Override<a name="line.906"></a>
+<span class="sourceLineNo">907</span>  public long size() {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    return getMaxSize();<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  public long getBloomBlockCount() {<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    return this.bloomBlockElements.sum();<a name="line.912"></a>
-<span class="sourceLineNo">913</span>  }<a name="line.913"></a>
-<span class="sourceLineNo">914</span><a name="line.914"></a>
-<span class="sourceLineNo">915</span>  EvictionThread getEvictionThread() {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    return this.evictionThread;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>  }<a name="line.917"></a>
-<span class="sourceLineNo">918</span><a name="line.918"></a>
-<span class="sourceLineNo">919</span>  /*<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.920"></a>
-<span class="sourceLineNo">921</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.921"></a>
-<span class="sourceLineNo">922</span>   * LruBlockCache#runEviction()}<a name="line.922"></a>
-<span class="sourceLineNo">923</span>   */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  static class EvictionThread extends Thread {<a name="line.924"></a>
-<span class="sourceLineNo">925</span><a name="line.925"></a>
-<span class="sourceLineNo">926</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    private volatile boolean go = true;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    // flag set after enter the run method, used for test<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    private boolean enteringRun = false;<a name="line.929"></a>
-<span class="sourceLineNo">930</span><a name="line.930"></a>
-<span class="sourceLineNo">931</span>    public EvictionThread(LruBlockCache cache) {<a name="line.931"></a>
-<span class="sourceLineNo">932</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      setDaemon(true);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    }<a name="line.935"></a>
-<span class="sourceLineNo">936</span><a name="line.936"></a>
-<span class="sourceLineNo">937</span>    @Override<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    public void run() {<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      enteringRun = true;<a name="line.939"></a>
-<span class="sourceLineNo">940</span>      while (this.go) {<a name="line.940"></a>
-<span class="sourceLineNo">941</span>        synchronized (this) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>          try {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>          } catch (InterruptedException e) {<a name="line.944"></a>
-<span class="sourceLineNo">945</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.945"></a>
-<span class="sourceLineNo">946</span>            Thread.currentThread().interrupt();<a name="line.946"></a>
-<span class="sourceLineNo">947</span>          }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>        }<a name="line.948"></a>
-<span class="sourceLineNo">949</span>        LruBlockCache cache = this.cache.get();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        if (cache == null) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>          this.go = false;<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          break;<a name="line.952"></a>
-<span class="sourceLineNo">953</span>        }<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        cache.evict();<a name="line.954"></a>
-<span class="sourceLineNo">955</span>      }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    }<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.958"></a>
-<span class="sourceLineNo">959</span>        justification = "This is what we want")<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    public void evict() {<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      synchronized (this) {<a name="line.961"></a>
-<span class="sourceLineNo">962</span>        this.notifyAll();<a name="line.962"></a>
-<span class="sourceLineNo">963</span>      }<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    }<a name="line.964"></a>
-<span class="sourceLineNo">965</span><a name="line.965"></a>
-<span class="sourceLineNo">966</span>    synchronized void shutdown() {<a name="line.966"></a>
-<span class="sourceLineNo">967</span>      this.go = false;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>      this.notifyAll();<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    }<a name="line.969"></a>
-<span class="sourceLineNo">970</span><a name="line.970"></a>
-<span class="sourceLineNo">971</span>    public boolean isGo() {<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      return go;<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    }<a name="line.973"></a>
-<span class="sourceLineNo">974</span><a name="line.974"></a>
-<span class="sourceLineNo">975</span>    /**<a name="line.975"></a>
-<span class="sourceLineNo">976</span>     * Used for the test.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>     */<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    boolean isEnteringRun() {<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      return this.enteringRun;<a name="line.979"></a>
-<span class="sourceLineNo">980</span>    }<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  }<a name="line.981"></a>
-<span class="sourceLineNo">982</span><a name="line.982"></a>
-<span class="sourceLineNo">983</span>  /*<a name="line.983"></a>
-<span class="sourceLineNo">984</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.984"></a>
-<span class="sourceLineNo">985</span>   */<a name="line.985"></a>
-<span class="sourceLineNo">986</span>  static class StatisticsThread extends Thread {<a name="line.986"></a>
-<span class="sourceLineNo">987</span><a name="line.987"></a>
-<span class="sourceLineNo">988</span>    private final LruBlockCache lru;<a name="line.988"></a>
-<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      super("LruBlockCacheStats");<a name="line.991"></a>
-<span class="sourceLineNo">992</span>      setDaemon(true);<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      this.lru = lru;<a name="line.993"></a>
+<span class="sourceLineNo">911</span>  @Override<a name="line.911"></a>
+<span class="sourceLineNo">912</span>  public long getBlockCount() {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    return this.elements.get();<a name="line.913"></a>
+<span class="sourceLineNo">914</span>  }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>  @Override<a name="line.916"></a>
+<span class="sourceLineNo">917</span>  public long getDataBlockCount() {<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    return this.dataBlockElements.sum();<a name="line.918"></a>
+<span class="sourceLineNo">919</span>  }<a name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>  public long getIndexBlockCount() {<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    return this.indexBlockElements.sum();<a name="line.922"></a>
+<span class="sourceLineNo">923</span>  }<a name="line.923"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span>  public long getBloomBlockCount() {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    return this.bloomBlockElements.sum();<a name="line.926"></a>
+<span class="sourceLineNo">927</span>  }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>  EvictionThread getEvictionThread() {<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    return this.evictionThread;<a name="line.930"></a>
+<span class="sourceLineNo">931</span>  }<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>  /*<a name="line.933"></a>
+<span class="sourceLineNo">934</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   * LruBlockCache#runEviction()}<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   */<a name="line.937"></a>
+<span class="sourceLineNo">938</span>  static class EvictionThread extends Thread {<a name="line.938"></a>
+<span class="sourceLineNo">939</span><a name="line.939"></a>
+<span class="sourceLineNo">940</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    private volatile boolean go = true;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // flag set after enter the run method, used for test<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    private boolean enteringRun = false;<a name="line.943"></a>
+<span class="sourceLineNo">944</span><a name="line.944"></a>
+<span class="sourceLineNo">945</span>    public EvictionThread(LruBlockCache cache) {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      setDaemon(true);<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    }<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>    @Override<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    public void run() {<a name="line.952"></a>
+<span class="sourceLineNo">953</span>      enteringRun = true;<a name="line.953"></a>
+<span class="sourceLineNo">954</span>      while (this.go) {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>        synchronized (this) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>          try {<a name="line.956"></a>
+<span class="sourceLineNo">957</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.957"></a>
+<span class="sourceLineNo">958</span>          } catch (InterruptedException e) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.959"></a>
+<span class="sourceLineNo">960</span>            Thread.currentThread().interrupt();<a name="line.960"></a>
+<span class="sourceLineNo">961</span>          }<a name="line.961"></a>
+<span class="sourceLineNo">962</span>        }<a name="line.962"></a>
+<span class="sourceLineNo">963</span>        LruBlockCache cache = this.cache.get();<a name="line.963"></a>
+<span class="sourceLineNo">964</span>        if (cache == null) {<a name="line.964"></a>
+<span class="sourceLineNo">965</span>          this.go = false;<a name="line.965"></a>
+<span class="sourceLineNo">966</span>          break;<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        }<a name="line.967"></a>
+<span class="sourceLineNo">968</span>        cache.evict();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      }<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        justification = "This is what we want")<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    public void evict() {<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      synchronized (this) {<a name="line.975"></a>
+<span class="sourceLineNo">976</span>        this.notifyAll();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      }<a name="line.977"></a>
+<span class="sourceLineNo">978</span>    }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>    synchronized void shutdown() {<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      this.go = false;<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      this.notifyAll();<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    public boolean isGo() {<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      return go;<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span><a name="line.988"></a>
+<span class="sourceLineNo">989</span>    /**<a name="line.989"></a>
+<span class="sourceLineNo">990</span>     * Used for the test.<a name="line.990"></a>
+<span class="sourceLineNo">991</span>     */<a name="line.991"></a>
+<span class="sourceLineNo">992</span>    boolean isEnteringRun() {<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      return this.enteringRun;<a name="line.993"></a>
 <span class="sourceLineNo">994</span>    }<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>    @Override<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    public void run() {<a name="line.997"></a>
-<span class="sourceLineNo">998</span>      lru.logStats();<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    }<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>  }<a name="line.1000"></a>
+<span class="sourceLineNo">995</span>  }<a name="line.995"></a>
+<span class="sourceLineNo">996</span><a name="line.996"></a>
+<span class="sourceLineNo">997</span>  /*<a name="line.997"></a>
+<span class="sourceLineNo">998</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>   */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>  static class StatisticsThread extends Thread {<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span><a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>  public void logStats() {<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    // Log size<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    long totalSize = heapSize();<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    long freeSize = maxSize - totalSize;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>      + (stats.getHitCount() == 0<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>        ? "0"<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      + (stats.getHitCachingCount() == 0<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>        ? "0,"<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  }<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span><a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>  /**<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>   * Get counter statistics for this cache.<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   * &lt;p&gt;<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>   */<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>  @Override<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>  public CacheStats getStats() {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    return this.stats;<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>  }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span><a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span><a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>  @Override<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  public long heapSize() {<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    return getCurrentSize();<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>  }<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span><a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  }<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>  @Override<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>      private final long now = System.nanoTime();<a name="line.1052"></a>
+<span class="sourceLineNo">1002</span>    private final LruBlockCache lru;<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span><a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>      super("LruBlockCacheStats");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>      setDaemon(true);<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>      this.lru = lru;<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    }<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span><a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    @Override<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    public void run() {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      lru.logStats();<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>    }<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>  }<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span><a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>  public void logStats() {<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>    // Log size<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>    long totalSize = heapSize();<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>    long freeSize = maxSize - totalSize;<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      + (stats.getHitCount() == 0<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>        ? "0"<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>      + (stats.getHitCachingCount() == 0<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>        ? "0,"<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span><a name="line.1035"></a>
+<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>   * Get counter statistics for this cache.<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>   * &lt;p&gt;<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>   */<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>  @Override<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>  public CacheStats getStats() {<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    return this.stats;<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>  }<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span><a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span><a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>  @Override<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>  public long heapSize() {<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    return getCurrentSize();<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>      @Override<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>      public boolean hasNext() {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>        return iterator.hasNext();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>      }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>      @Override<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      public CachedBlock next() {<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        final LruCachedBlock b = iterator.next();<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        return new CachedBlock() {<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>          @Override<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>          public String toString() {<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>            return BlockCacheUtil.toString(this, now);<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>          }<a name="line.1066"></a>
+<span class="sourceLineNo">1054</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>  }<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span><a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  @Override<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span><a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>      private final long now = System.nanoTime();<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span><a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>          @Override<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>          public BlockPriority getBlockPriority() {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>            return b.getPriority();<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>          }<a name="line.1071"></a>
+<span class="sourceLineNo">1068</span>      @Override<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>      public boolean hasNext() {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>        return iterator.hasNext();<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>      }<a name="line.1071"></a>
 <span class="sourceLineNo">1072</span><a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>          @Override<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>          public BlockType getBlockType() {<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>            return b.getBuffer().getBlockType();<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>          }<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span><a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>          @Override<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>          public long getOffset() {<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>            return b.getCacheKey().getOffset();<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>          }<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span><a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>          @Override<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>          public long getSize() {<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>            return b.getBuffer().heapSize();<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>          }<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span><a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>          @Override<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>          public long getCachedTime() {<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>            return b.getCachedTime();<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>          }<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span><a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          @Override<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          public String getFilename() {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            return b.getCacheKey().getHfileName();<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          }<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span><a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          @Override<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>          public int compareTo(CachedBlock other) {<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>            if (diff != 0) {<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>              return diff;<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>            }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>            if (diff != 0) {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>              return diff;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>            }<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>            }<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>          }<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span><a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>          @Override<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>          public int hashCode() {<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>            return b.hashCode();<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>          }<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span><a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>          @Override<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>          public boolean equals(Object obj) {<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>            if (obj instanceof CachedBlock) {<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>              return compareTo(cb) == 0;<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>            } else {<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>              return false;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>            }<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>          }<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>        };<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>      }<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span><a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>      @Override<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>      public void remove() {<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>        throw new UnsupportedOperationException();<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>      }<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    };<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>  }<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span><a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span><a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>  long acceptableSize() {<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>  }<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span><a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>  private long minSize() {<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>  }<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>  private long singleSize() {<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1149"></a>
+<span class="sourceLineNo">1073</span>      @Override<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>      public CachedBlock next() {<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>        final LruCachedBlock b = iterator.next();<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>        return new CachedBlock() {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>          @Override<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>          public String toString() {<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>            return BlockCacheUtil.toString(this, now);<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>          }<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span><a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>          @Override<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>          public BlockPriority getBlockPriority() {<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>            return b.getPriority();<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>          }<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span><a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>          @Override<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>          public BlockType getBlockType() {<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>            return b.getBuffer().getBlockType();<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>          }<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span><a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>          @Override<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>          public long getOffset() {<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>            return b.getCacheKey().getOffset();<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>          }<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span><a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>          @Override<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>          public long getSize() {<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>            return b.getBuffer().heapSize();<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>          }<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>          @Override<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>          public long getCachedTime() {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>            return b.getCachedTime();<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>          }<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span><a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>          @Override<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>          public String getFilename() {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>            return b.getCacheKey().getHfileName();<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          }<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span><a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          @Override<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>          public int compareTo(CachedBlock other) {<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            if (diff != 0) {<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>              return diff;<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>            }<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>            if (diff != 0) {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>              return diff;<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>            }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>            }<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>          }<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span><a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>          @Override<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>          public int hashCode() {<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>            return b.hashCode();<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>          }<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span><a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>          @Override<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>          public boolean equals(Object obj) {<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>            if (obj instanceof CachedBlock) {<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>              return compareTo(cb) == 0;<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>            } else {<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>              return false;<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>            }<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>          }<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>        };<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>      }<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span><a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>      @Override<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>      public void remove() {<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>        throw new UnsupportedOperationException();<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span>      }<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>    };<a name="line.1149"></a>
 <span class="sourceLineNo">1150</span>  }<a name="line.1150"></a>
 <span class="sourceLineNo">1151</span><a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>  private long multiSize() {<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>  }<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span><a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>  private long memorySize() {<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>  }<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span><a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>  @Override<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>  public void shutdown() {<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>    if (victimHandler != null) {<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>      victimHandler.shutdown();<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>    }<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>    this.scheduleThreadPool.shutdown();<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>        try {<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>          Thread.sleep(10);<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>        } catch (InterruptedException e) {<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>          LOG.warn("Interrupted while sleeping");<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>          Thread.currentThread().interrupt();<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>          break;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>        }<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>      }<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    }<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span><a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>      LOG.debug("Still running " + runnables);<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>    }<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    this.evictionThread.shutdown();<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>  }<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>  /** Clears the cache. Used in tests. */<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>  public void clearCache() {<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>    this.map.clear();<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    this.elements.set(0);<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>  }<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span><a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>  /**<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>   * Used in testing. May be very inefficient.<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>   * @return the set of cached file names<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>   */<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    }<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    return fileNames;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>  }<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span><a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    for (LruCachedBlock block : map.values()) {<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>      Integer count = counts.get(encoding);<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    }<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    return counts;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>  }<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span><a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>    return map;<a name="line.1214"></a>
+<span class="sourceLineNo">1152</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span><a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>  long acceptableSize() {<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>  }<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span><a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>  private long minSize() {<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>  }<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>  private long singleSize() {<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>  }<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span><a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>  private long multiSize() {<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>  }<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>  private long memorySize() {<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>  }<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span><a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>  @Override<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>  public void shutdown() {<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>    if (victimHandler != null) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>      victimHandler.shutdown();<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>    }<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>    this.scheduleThreadPool.shutdown();<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>        try {<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>          Thread.sleep(10);<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span>        } catch (InterruptedException e) {<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span>          LOG.warn("Interrupted while sleeping");<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>          Thread.currentThread().interrupt();<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span>          break;<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>        }<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>      }<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span>    }<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span><a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>      LOG.debug("Still running " + runnables);<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>    }<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span>    this.evictionThread.shutdown();<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>  }<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span><a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>  /** Clears the cache. Used in tests. */<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span>  public void clearCache() {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>    this.map.clear();<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>    this.elements.set(0);<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>  }<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span><a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>  /**<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>   * Used in testing. May be very inefficient.<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span>   * @return the set of cached file names<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>   */<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span>    }<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>    return fileNames;<a name="line.1214"></a>
 <span class="sourceLineNo">1215</span>  }<a name="line.1215"></a>
 <span class="sourceLineNo">1216</span><a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>  @Override<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>  public BlockCache[] getBlockCaches() {<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>    if (victimHandler != null) {<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>    }<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>    return null;<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>  }<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>}<a name="line.1224"></a>
+<span class="sourceLineNo">1217</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>    for (LruCachedBlock block : map.values()) {<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>      Integer count = counts.get(encoding);<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>    }<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>    return counts;<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>  }<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span><a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>    return map;<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span>  }<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span><a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>  @Override<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>  public BlockCache[] getBlockCaches() {<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>    if (victimHandler != null) {<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>    }<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span>    return null;<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>  }<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>}<a name="line.1238"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
index da165dc..ed10198 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/LruBlockCache.html
@@ -42,1194 +42,1208 @@
 <span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import java.util.concurrent.atomic.LongAdder;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.conf.Configuration;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.util.StringUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * operations.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;/p&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * least-frequently-used element to the eviction algorithm.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * &lt;p/&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * chunk the others are able to grow beyond their chunk size.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * &lt;p/&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;p/&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * thread.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;p/&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * &lt;p/&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * sizes and usage.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>@InterfaceAudience.Private<a name="line.87"></a>
-<span class="sourceLineNo">088</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    "hbase.lru.blockcache.single.percentage";<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * is a cluster-wide configuration<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /* Default Configuration Parameters */<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  /* Backing Concurrent Map Configuration */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  /* Eviction thresholds */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /* Priority buckets */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /* Statistics thread */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#computeIfPresent<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * (key, func). Besides, the func method must execute exactly once only when the key is present<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * and under the lock context, otherwise the reference count will be messed up. Notice that the<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  /** Eviction lock (locked when eviction in process) */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.158"></a>
+<span class="sourceLineNo">037</span>import org.apache.commons.lang3.mutable.MutableBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.util.StringUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.com.google.common.base.Objects;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * A block cache implementation that is memory-aware using {@link HeapSize}, memory-bound using an<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * LRU eviction algorithm, and concurrent: backed by a {@link ConcurrentHashMap} and with a<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * non-blocking eviction thread giving constant-time {@link #cacheBlock} and {@link #getBlock}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * operations.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;/p&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Contains three levels of block priority to allow for scan-resistance and in-memory families<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder#setInMemory(boolean)} (An<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * in-memory column family is a column family that should be served from memory if possible):<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * single-access, multiple-accesses, and in-memory priority. A block is added with an in-memory<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * priority flag if {@link org.apache.hadoop.hbase.client.ColumnFamilyDescriptor#isInMemory()},<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * otherwise a block becomes a single access priority the first time it is read into this block<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * cache. If a block is accessed again while in cache, it is marked as a multiple access priority<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * block. This delineation of blocks is used to prevent scans from thrashing the cache adding a<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * least-frequently-used element to the eviction algorithm.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * &lt;p/&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Each priority is given its own chunk of the total cache to ensure fairness during eviction. Each<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * priority will retain close to its maximum size, however, if any priority is not using its entire<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * chunk the others are able to grow beyond their chunk size.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * &lt;p/&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Instantiated at a minimum with the total size and average block size. All sizes are in bytes. The<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * block size is not especially important as this cache is fully dynamic in its sizing of blocks. It<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * is only used for pre-allocating data structures and in initial heap estimation of the map.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p/&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * The detailed constructor defines the sizes for the three priorities (they should total to the<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;code&gt;maximum size&lt;/code&gt; defined). It also sets the levels that trigger and control the eviction<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * thread.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * &lt;p/&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * The &lt;code&gt;acceptable size&lt;/code&gt; is the cache size level which triggers the eviction process to<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * start. It evicts enough blocks to get the size below the minimum size specified.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * &lt;p/&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Eviction happens in a separate thread and involves a single full-scan of the map. It determines<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * how many bytes must be freed to reach the minimum size, and then while scanning determines the<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * fewest least-recently-used blocks necessary from each of the three priorities (would be 3 times<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * bytes to free). It then uses the priority chunk sizes to evict fairly according to the relative<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * sizes and usage.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>@InterfaceAudience.Private<a name="line.88"></a>
+<span class="sourceLineNo">089</span>public class LruBlockCache implements FirstLevelBlockCache {<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private static final Logger LOG = LoggerFactory.getLogger(LruBlockCache.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Percentage of total size that eviction will evict until; e.g. if set to .8, then we will keep<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * evicting during an eviction run till the cache size is down to 80% of the total.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Acceptable size of cache (no evictions if size &lt; acceptable)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    "hbase.lru.blockcache.acceptable.factor";<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * Hard capacity limit of cache, will reject any put if size &gt; this * acceptable<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  static final String LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME =<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    "hbase.lru.blockcache.hard.capacity.limit.factor";<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  private static final String LRU_SINGLE_PERCENTAGE_CONFIG_NAME =<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    "hbase.lru.blockcache.single.percentage";<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  private static final String LRU_MULTI_PERCENTAGE_CONFIG_NAME =<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    "hbase.lru.blockcache.multi.percentage";<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private static final String LRU_MEMORY_PERCENTAGE_CONFIG_NAME =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    "hbase.lru.blockcache.memory.percentage";<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Configuration key to force data-block always (except in-memory are too much) cached in memory<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * for in-memory hfile, unlike inMemory, which is a column-family configuration, inMemoryForceMode<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * is a cluster-wide configuration<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  private static final String LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    "hbase.lru.rs.inmemoryforcemode";<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  /* Default Configuration Parameters */<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /* Backing Concurrent Map Configuration */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  static final float DEFAULT_LOAD_FACTOR = 0.75f;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  static final int DEFAULT_CONCURRENCY_LEVEL = 16;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  /* Eviction thresholds */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  private static final float DEFAULT_MIN_FACTOR = 0.95f;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  static final float DEFAULT_ACCEPTABLE_FACTOR = 0.99f;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /* Priority buckets */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private static final float DEFAULT_MULTI_FACTOR = 0.50f;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private static final float DEFAULT_HARD_CAPACITY_LIMIT_FACTOR = 1.2f;<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final boolean DEFAULT_IN_MEMORY_FORCE_MODE = false;<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  /* Statistics thread */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static final int STAT_THREAD_PERIOD = 60 * 5;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String LRU_MAX_BLOCK_SIZE = "hbase.lru.max.block.size";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static final long DEFAULT_MAX_BLOCK_SIZE = 16L * 1024L * 1024L;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  /**<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * Defined the cache map as {@link ConcurrentHashMap} here, because in<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * {@link LruBlockCache#getBlock}, we need to guarantee the atomicity of map#k (key, func).<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * Besides, the func method must execute exactly once only when the key is present and under the<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * lock context, otherwise the reference count will be messed up. Notice that the<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * {@link java.util.concurrent.ConcurrentSkipListMap} can not guarantee that. Some code using<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * #computeIfPresent also expects the supplier to be executed only once. ConcurrentHashMap can<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * guarantee that. Other types may not.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  private transient final ConcurrentHashMap&lt;BlockCacheKey, LruCachedBlock&gt; map;<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  private final long maxBlockSize;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  private volatile boolean evictionInProgress = false;<a name="line.163"></a>
+<span class="sourceLineNo">160</span>  /** Eviction lock (locked when eviction in process) */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  private transient final ReentrantLock evictionLock = new ReentrantLock(true);<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private final long maxBlockSize;<a name="line.163"></a>
 <span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /** Eviction thread */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  private transient final EvictionThread evictionThread;<a name="line.166"></a>
+<span class="sourceLineNo">165</span>  /** Volatile boolean to track if we are in an eviction process or not */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  private volatile boolean evictionInProgress = false;<a name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /** Current size of cache */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private final AtomicLong size;<a name="line.174"></a>
+<span class="sourceLineNo">168</span>  /** Eviction thread */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private transient final EvictionThread evictionThread;<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /** Statistics thread schedule pool (for heavy debugging, could remove) */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  private transient final ScheduledExecutorService scheduleThreadPool =<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder()<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      .setNameFormat("LruBlockCacheStatsExecutor").setDaemon(true).build());<a name="line.174"></a>
 <span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  /** Current size of data blocks */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.177"></a>
+<span class="sourceLineNo">176</span>  /** Current size of cache */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  private final AtomicLong size;<a name="line.177"></a>
 <span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  /** Current size of index blocks */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.180"></a>
+<span class="sourceLineNo">179</span>  /** Current size of data blocks */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  private final LongAdder dataBlockSize = new LongAdder();<a name="line.180"></a>
 <span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /** Current size of bloom blocks */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.183"></a>
+<span class="sourceLineNo">182</span>  /** Current size of index blocks */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  private final LongAdder indexBlockSize = new LongAdder();<a name="line.183"></a>
 <span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  /** Current number of cached elements */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private final AtomicLong elements;<a name="line.186"></a>
+<span class="sourceLineNo">185</span>  /** Current size of bloom blocks */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  private final LongAdder bloomBlockSize = new LongAdder();<a name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  /** Current number of cached data block elements */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.189"></a>
+<span class="sourceLineNo">188</span>  /** Current number of cached elements */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  private final AtomicLong elements;<a name="line.189"></a>
 <span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /** Current number of cached index block elements */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.192"></a>
+<span class="sourceLineNo">191</span>  /** Current number of cached data block elements */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  private final LongAdder dataBlockElements = new LongAdder();<a name="line.192"></a>
 <span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  /** Current number of cached bloom block elements */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.195"></a>
+<span class="sourceLineNo">194</span>  /** Current number of cached index block elements */<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  private final LongAdder indexBlockElements = new LongAdder();<a name="line.195"></a>
 <span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /** Cache access count (sequential ID) */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private final AtomicLong count;<a name="line.198"></a>
+<span class="sourceLineNo">197</span>  /** Current number of cached bloom block elements */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  private final LongAdder bloomBlockElements = new LongAdder();<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /** hard capacity limit */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  private float hardCapacityLimitFactor;<a name="line.201"></a>
+<span class="sourceLineNo">200</span>  /** Cache access count (sequential ID) */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  private final AtomicLong count;<a name="line.201"></a>
 <span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  /** Cache statistics */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  private final CacheStats stats;<a name="line.204"></a>
+<span class="sourceLineNo">203</span>  /** hard capacity limit */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private float hardCapacityLimitFactor;<a name="line.204"></a>
 <span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  private long maxSize;<a name="line.207"></a>
+<span class="sourceLineNo">206</span>  /** Cache statistics */<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  private final CacheStats stats;<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /** Approximate block size */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  private long blockSize;<a name="line.210"></a>
+<span class="sourceLineNo">209</span>  /** Maximum allowable size of cache (block put if size &gt; max, evict) */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  private long maxSize;<a name="line.210"></a>
 <span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  private float acceptableFactor;<a name="line.213"></a>
+<span class="sourceLineNo">212</span>  /** Approximate block size */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  private long blockSize;<a name="line.213"></a>
 <span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  private float minFactor;<a name="line.216"></a>
+<span class="sourceLineNo">215</span>  /** Acceptable size of cache (no evictions if size &lt; acceptable) */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  private float acceptableFactor;<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  /** Single access bucket size */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  private float singleFactor;<a name="line.219"></a>
+<span class="sourceLineNo">218</span>  /** Minimum threshold of cache (when evicting, evict until size &lt; min) */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  private float minFactor;<a name="line.219"></a>
 <span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /** Multiple access bucket size */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private float multiFactor;<a name="line.222"></a>
+<span class="sourceLineNo">221</span>  /** Single access bucket size */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  private float singleFactor;<a name="line.222"></a>
 <span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>  /** In-memory bucket size */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  private float memoryFactor;<a name="line.225"></a>
+<span class="sourceLineNo">224</span>  /** Multiple access bucket size */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  private float multiFactor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** Overhead of the structure itself */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  private long overhead;<a name="line.228"></a>
+<span class="sourceLineNo">227</span>  /** In-memory bucket size */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private float memoryFactor;<a name="line.228"></a>
 <span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  private boolean forceInMemory;<a name="line.231"></a>
+<span class="sourceLineNo">230</span>  /** Overhead of the structure itself */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private long overhead;<a name="line.231"></a>
 <span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  private transient BlockCache victimHandler = null;<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * fine).<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param blockSize approximate size of each block, in bytes<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    this(maxSize, blockSize, true);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    this(maxSize, blockSize, true, conf);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    this.maxBlockSize = maxBlockSize;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    if (<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        || memoryFactor &lt; 0<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    ) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      throw new IllegalArgumentException(<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.305"></a>
+<span class="sourceLineNo">233</span>  /** Whether in-memory hfile's data block has higher priority when evicting */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  private boolean forceInMemory;<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>  /**<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * Where to send victims (blocks evicted/missing from the cache). This is used only when we use an<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * external cache as L2. Note: See org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  private transient BlockCache victimHandler = null;<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * Default constructor. Specify maximum size and expected average block size (approximation is<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * fine).<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * &lt;p&gt;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * All other factors will be calculated based on defaults specified in this class.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param maxSize   maximum size of cache, in bytes<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param blockSize approximate size of each block, in bytes<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public LruBlockCache(long maxSize, long blockSize) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    this(maxSize, blockSize, true);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * Constructor used for testing. Allows disabling of the eviction thread.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_MIN_FACTOR, DEFAULT_ACCEPTABLE_FACTOR,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      DEFAULT_SINGLE_FACTOR, DEFAULT_MULTI_FACTOR, DEFAULT_MEMORY_FACTOR,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      DEFAULT_HARD_CAPACITY_LIMIT_FACTOR, false, DEFAULT_MAX_BLOCK_SIZE);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, Configuration conf) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    this(maxSize, blockSize, evictionThread, (int) Math.ceil(1.2 * maxSize / blockSize),<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR),<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR),<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      conf.getFloat(LRU_SINGLE_PERCENTAGE_CONFIG_NAME, DEFAULT_SINGLE_FACTOR),<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      conf.getFloat(LRU_MULTI_PERCENTAGE_CONFIG_NAME, DEFAULT_MULTI_FACTOR),<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      conf.getFloat(LRU_MEMORY_PERCENTAGE_CONFIG_NAME, DEFAULT_MEMORY_FACTOR),<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      conf.getFloat(LRU_HARD_CAPACITY_LIMIT_FACTOR_CONFIG_NAME, DEFAULT_HARD_CAPACITY_LIMIT_FACTOR),<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      conf.getBoolean(LRU_IN_MEMORY_FORCE_MODE_CONFIG_NAME, DEFAULT_IN_MEMORY_FORCE_MODE),<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      conf.getLong(LRU_MAX_BLOCK_SIZE, DEFAULT_MAX_BLOCK_SIZE));<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public LruBlockCache(long maxSize, long blockSize, Configuration conf) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    this(maxSize, blockSize, true, conf);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Configurable constructor. Use this constructor if not using defaults.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * @param maxSize             maximum size of this cache, in bytes<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * @param blockSize           expected average size of blocks, in bytes<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * @param evictionThread      whether to run evictions in a bg thread or not<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @param mapInitialSize      initial size of backing ConcurrentHashMap<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param mapLoadFactor       initial load factor of backing ConcurrentHashMap<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param mapConcurrencyLevel initial concurrency factor for backing CHM<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @param minFactor           percentage of total size that eviction will evict until<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * @param acceptableFactor    percentage of total size that triggers eviction<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * @param singleFactor        percentage of total size for single-access blocks<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param multiFactor         percentage of total size for multiple-access blocks<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   * @param memoryFactor        percentage of total size for in-memory blocks<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  public LruBlockCache(long maxSize, long blockSize, boolean evictionThread, int mapInitialSize,<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    float mapLoadFactor, int mapConcurrencyLevel, float minFactor, float acceptableFactor,<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    float singleFactor, float multiFactor, float memoryFactor, float hardLimitFactor,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    boolean forceInMemory, long maxBlockSize) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    this.maxBlockSize = maxBlockSize;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    if (<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      singleFactor + multiFactor + memoryFactor != 1 || singleFactor &lt; 0 || multiFactor &lt; 0<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        || memoryFactor &lt; 0<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    ) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      throw new IllegalArgumentException(<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        "Single, multi, and memory factors " + " should be non-negative and total 1.0");<a name="line.305"></a>
 <span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.308"></a>
+<span class="sourceLineNo">307</span>    if (minFactor &gt;= acceptableFactor) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      throw new IllegalArgumentException("minFactor must be smaller than acceptableFactor");<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    this.maxSize = maxSize;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    this.blockSize = blockSize;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    this.forceInMemory = forceInMemory;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    this.minFactor = minFactor;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    this.acceptableFactor = acceptableFactor;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    this.singleFactor = singleFactor;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    this.multiFactor = multiFactor;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    this.memoryFactor = memoryFactor;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    this.count = new AtomicLong(0);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    this.elements = new AtomicLong(0);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    this.size = new AtomicLong(this.overhead);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    if (evictionThread) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      this.evictionThread = new EvictionThread(this);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      this.evictionThread = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    // every five minutes.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    if (victimHandler != null) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    victimHandler = requireNonNull(victimCache);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  public void setMaxSize(long maxSize) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.maxSize = maxSize;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      runEviction();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>  /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * JVM, so need a retain here.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @param buf the original block<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * @return an block with an heap memory backend.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    if (buf instanceof HFileBlock) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      if (blk.isSharedMem()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return buf.retain();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  // BlockCache implementation<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Cache the block with the specified name and buffer.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   * &lt;p&gt;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * this can happen, for which we compare the buffer contents.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param cacheKey block's cache key<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @param buf      block buffer<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param inMemory if block is in-memory<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   */<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  @Override<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      // If there are a lot of blocks that are too<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      // big this can make the logs way too noisy.<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      // So we log 2%<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (stats.failInsert() % 50 == 0) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          + maxBlockSize);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      return;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    long currentSize = size.get();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    long currentAcceptableSize = acceptableSize();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      stats.failInsert();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      if (LOG.isTraceEnabled()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      if (!evictionInProgress) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        runEviction();<a name="line.420"></a>
+<span class="sourceLineNo">310</span>    if (minFactor &gt;= 1.0f || acceptableFactor &gt;= 1.0f) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      throw new IllegalArgumentException("all factors must be &lt; 1");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    this.maxSize = maxSize;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    this.blockSize = blockSize;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    this.forceInMemory = forceInMemory;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    map = new ConcurrentHashMap&lt;&gt;(mapInitialSize, mapLoadFactor, mapConcurrencyLevel);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    this.minFactor = minFactor;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    this.acceptableFactor = acceptableFactor;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    this.singleFactor = singleFactor;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    this.multiFactor = multiFactor;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    this.memoryFactor = memoryFactor;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    this.stats = new CacheStats(this.getClass().getSimpleName());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    this.count = new AtomicLong(0);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    this.elements = new AtomicLong(0);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    this.overhead = calculateOverhead(maxSize, blockSize, mapConcurrencyLevel);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    this.size = new AtomicLong(this.overhead);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    this.hardCapacityLimitFactor = hardLimitFactor;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    if (evictionThread) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      this.evictionThread = new EvictionThread(this);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      this.evictionThread.start(); // FindBugs SC_START_IN_CTOR<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.evictionThread = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    // TODO: Add means of turning this off. Bit obnoxious running thread just to make a log<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    // every five minutes.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    this.scheduleThreadPool.scheduleAtFixedRate(new StatisticsThread(this), STAT_THREAD_PERIOD,<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      STAT_THREAD_PERIOD, TimeUnit.SECONDS);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void setVictimCache(BlockCache victimCache) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (victimHandler != null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      throw new IllegalArgumentException("The victim cache has already been set");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    victimHandler = requireNonNull(victimCache);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void setMaxSize(long maxSize) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.maxSize = maxSize;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    if (this.size.get() &gt; acceptableSize() &amp;&amp; !evictionInProgress) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      runEviction();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>  /**<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * The block cached in LRUBlockCache will always be an heap block: on the one side, the heap<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * access will be more faster then off-heap, the small index block or meta block cached in<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * CombinedBlockCache will benefit a lot. on other side, the LRUBlockCache size is always<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * calculated based on the total heap size, if caching an off-heap block in LRUBlockCache, the<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * heap size will be messed up. Here we will clone the block into an heap block if it's an<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * off-heap block, otherwise just use the original block. The key point is maintain the refCnt of<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * the block (HBASE-22127): &lt;br&gt;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * 1. if cache the cloned heap block, its refCnt is an totally new one, it's easy to handle; &lt;br&gt;<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * 2. if cache the original heap block, we're sure that it won't be tracked in ByteBuffAllocator's<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * reservoir, if both RPC and LRUBlockCache release the block, then it can be garbage collected by<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   * JVM, so need a retain here.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   * @param buf the original block<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * @return an block with an heap memory backend.<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   */<a name="line.370"></a>
+<span class="sourceLineNo">371</span>  private Cacheable asReferencedHeapBlock(Cacheable buf) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (buf instanceof HFileBlock) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      HFileBlock blk = ((HFileBlock) buf);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      if (blk.isSharedMem()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        return HFileBlock.deepCloneOnHeap(blk);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // The block will be referenced by this LRUBlockCache, so should increase its refCnt here.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    return buf.retain();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>  // BlockCache implementation<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Cache the block with the specified name and buffer.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * &lt;p&gt;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * It is assumed this will NOT be called on an already cached block. In rare cases (HBASE-8547)<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * this can happen, for which we compare the buffer contents.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param cacheKey block's cache key<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param buf      block buffer<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param inMemory if block is in-memory<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  @Override<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf, boolean inMemory) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    if (buf.heapSize() &gt; maxBlockSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      // If there are a lot of blocks that are too<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // big this can make the logs way too noisy.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      // So we log 2%<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      if (stats.failInsert() % 50 == 0) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        LOG.warn("Trying to cache too large a block " + cacheKey.getHfileName() + " @ "<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          + cacheKey.getOffset() + " is " + buf.heapSize() + " which is larger than "<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          + maxBlockSize);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      return;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    if (cb != null &amp;&amp; !BlockCacheUtil.shouldReplaceExistingCacheBlock(this, cacheKey, buf)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    long currentSize = size.get();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    long currentAcceptableSize = acceptableSize();<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long hardLimitSize = (long) (hardCapacityLimitFactor * currentAcceptableSize);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    if (currentSize &gt;= hardLimitSize) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      stats.failInsert();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      if (LOG.isTraceEnabled()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        LOG.trace("LruBlockCache current size " + StringUtils.byteDesc(currentSize)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          + " has exceeded acceptable size " + StringUtils.byteDesc(currentAcceptableSize) + "."<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          + " The hard limit size is " + StringUtils.byteDesc(hardLimitSize)<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          + ", failed to put cacheKey:" + cacheKey + " into LruBlockCache.");<a name="line.420"></a>
 <span class="sourceLineNo">421</span>      }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      return;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // Ensure that the block is an heap one.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    buf = asReferencedHeapBlock(buf);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    map.put(cacheKey, cb);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    long val = elements.incrementAndGet();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (buf.getBlockType().isBloom()) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      bloomBlockElements.increment();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      indexBlockElements.increment();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    } else if (buf.getBlockType().isData()) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      dataBlockElements.increment();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    if (LOG.isTraceEnabled()) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      long size = map.size();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      assertCounterSanity(size, val);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      runEviction();<a name="line.442"></a>
+<span class="sourceLineNo">422</span>      if (!evictionInProgress) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        runEviction();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    // Ensure that the block is an heap one.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    buf = asReferencedHeapBlock(buf);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    cb = new LruCachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    long newSize = updateSizeMetrics(cb, false);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    map.put(cacheKey, cb);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    long val = elements.incrementAndGet();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    if (buf.getBlockType().isBloom()) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      bloomBlockElements.increment();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    } else if (buf.getBlockType().isIndex()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      indexBlockElements.increment();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    } else if (buf.getBlockType().isData()) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      dataBlockElements.increment();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    if (LOG.isTraceEnabled()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      long size = map.size();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      assertCounterSanity(size, val);<a name="line.442"></a>
 <span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>  /**<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * use with TRACE level logging and -ea JVM.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    if (counterVal &lt; 0) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        + ", mapSize=" + mapSize);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      if (pct_diff &gt; 0.05) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.459"></a>
-<span class="sourceLineNo">460</span>          + ", mapSize=" + mapSize);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>  /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * Cache the block with the specified name and buffer.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   * &lt;p&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   * otherwise the caching size is based on off-heap.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * @param cacheKey block's cache key<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * @param buf      block buffer<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    cacheBlock(cacheKey, buf, false);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   */<a name="line.483"></a>
-<span class="sourceLineNo">484</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    long heapsize = cb.heapSize();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (evict) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      heapsize *= -1;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    if (bt != null) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (bt.isBloom()) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        bloomBlockSize.add(heapsize);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      } else if (bt.isIndex()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        indexBlockSize.add(heapsize);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      } else if (bt.isData()) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        dataBlockSize.add(heapsize);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    return size.addAndGet(heapsize);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * Get the buffer of the block with the specified name.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * @param cacheKey           block's cache key<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   *                           double counting cache misses when doing double-check locking)<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    boolean updateCacheMetrics) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      // see HBASE-22422.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      val.getBuffer().retain();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      return val;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    });<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    if (cb == null) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      // If there is another block cache then try and read there.<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      // However if this is a retry ( second time in double checked locking )<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        // Promote this to L1.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        if (result != null) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>          if (caching) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>          }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return result;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      }<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return null;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    if (updateCacheMetrics) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    cb.access(count.incrementAndGet());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    return cb.getBuffer();<a name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * Whether the cache contains block with specified cacheKey<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * @return true if contains the block<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  @Override<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    return map.containsKey(cacheKey);<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  @Override<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>  }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>  /**<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   * log-access-time map.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   * &lt;p&gt;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.569"></a>
-<span class="sourceLineNo">570</span>   * @return the number of blocks evicted<a name="line.570"></a>
-<span class="sourceLineNo">571</span>   */<a name="line.571"></a>
-<span class="sourceLineNo">572</span>  @Override<a name="line.572"></a>
-<span class="sourceLineNo">573</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    int numEvicted = 0;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        if (evictBlock(key)) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          ++numEvicted;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      }<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    if (victimHandler != null) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    return numEvicted;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * read again later<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @return the heap size of evicted block<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   */<a name="line.593"></a>
-<span class="sourceLineNo">594</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    LruCachedBlock previous = map.remove(block.getCacheKey());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    if (previous == null) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return 0;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    updateSizeMetrics(block, true);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    long val = elements.decrementAndGet();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    if (LOG.isTraceEnabled()) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      long size = map.size();<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      assertCounterSanity(size, val);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    if (bt.isBloom()) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      bloomBlockElements.decrement();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    } else if (bt.isIndex()) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      indexBlockElements.decrement();<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    } else if (bt.isData()) {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      dataBlockElements.decrement();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    if (evictedByEvictionProcess) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      // update the stats counter.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      if (victimHandler != null) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        victimHandler.cacheBlock(block.getCacheKey(), block.getBuffer());<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    // NOT move this up because if do that then the victimHandler may access the buffer with<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    // refCnt = 0 which is disallowed.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    previous.getBuffer().release();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    return block.heapSize();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>  /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   * Multi-threaded call to run the eviction process.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   */<a name="line.630"></a>
-<span class="sourceLineNo">631</span>  private void runEviction() {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      evict();<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    } else {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      evictionThread.evict();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>  }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>  boolean isEvictionInProgress() {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    return evictionInProgress;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>  }<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>  long getOverhead() {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    return overhead;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>  /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   * Eviction method.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>   */<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  void evict() {<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>    // Ensure only one eviction at a time<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    if (!evictionLock.tryLock()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    }<a name="line.655"></a>
+<span class="sourceLineNo">444</span>    if (newSize &gt; currentAcceptableSize &amp;&amp; !evictionInProgress) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      runEviction();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * Sanity-checking for parity between actual block cache content and metrics. Intended only for<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * use with TRACE level logging and -ea JVM.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private static void assertCounterSanity(long mapSize, long counterVal) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (counterVal &lt; 0) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      LOG.trace("counterVal overflow. Assertions unreliable. counterVal=" + counterVal<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        + ", mapSize=" + mapSize);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (mapSize &lt; Integer.MAX_VALUE) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      double pct_diff = Math.abs((((double) counterVal) / ((double) mapSize)) - 1.);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      if (pct_diff &gt; 0.05) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        LOG.trace("delta between reported and actual size &gt; 5%. counterVal=" + counterVal<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          + ", mapSize=" + mapSize);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   * Cache the block with the specified name and buffer.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   * &lt;p&gt;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * TODO after HBASE-22005, we may cache an block which allocated from off-heap, but our LRU cache<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * sizing is based on heap size, so we should handle this in HBASE-22127. It will introduce an<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * switch whether make the LRU on-heap or not, if so we may need copy the memory to on-heap,<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   * otherwise the caching size is based on off-heap.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>   * @param cacheKey block's cache key<a name="line.475"></a>
+<span class="sourceLineNo">476</span>   * @param buf      block buffer<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   */<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  @Override<a name="line.478"></a>
+<span class="sourceLineNo">479</span>  public void cacheBlock(BlockCacheKey cacheKey, Cacheable buf) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    cacheBlock(cacheKey, buf, false);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
+<span class="sourceLineNo">484</span>   * Helper function that updates the local size counter and also updates any per-cf or<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   * per-blocktype metrics it can discern from given {@link LruCachedBlock}<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
+<span class="sourceLineNo">487</span>  private long updateSizeMetrics(LruCachedBlock cb, boolean evict) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    long heapsize = cb.heapSize();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    BlockType bt = cb.getBuffer().getBlockType();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    if (evict) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      heapsize *= -1;<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    if (bt != null) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (bt.isBloom()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        bloomBlockSize.add(heapsize);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      } else if (bt.isIndex()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        indexBlockSize.add(heapsize);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      } else if (bt.isData()) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>        dataBlockSize.add(heapsize);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    return size.addAndGet(heapsize);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>  /**<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   * Get the buffer of the block with the specified name.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   * @param cacheKey           block's cache key<a name="line.507"></a>
+<span class="sourceLineNo">508</span>   * @param caching            true if the caller caches blocks on cache misses<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   * @param repeat             Whether this is a repeat lookup for the same block (used to avoid<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   *                           double counting cache misses when doing double-check locking)<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * @param updateCacheMetrics Whether to update cache metrics or not<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * @return buffer of specified cache key, or null if not in cache<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  @Override<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  public Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repeat,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    boolean updateCacheMetrics) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    LruCachedBlock cb = map.computeIfPresent(cacheKey, (key, val) -&gt; {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      // It will be referenced by RPC path, so increase here. NOTICE: Must do the retain inside<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      // this block. because if retain outside the map#computeIfPresent, the evictBlock may remove<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      // the block and release, then we're retaining a block with refCnt=0 which is disallowed.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      // see HBASE-22422.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      val.getBuffer().retain();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      return val;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    });<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    if (cb == null) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      if (!repeat &amp;&amp; updateCacheMetrics) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        stats.miss(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      // If there is another block cache then try and read there.<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      // However if this is a retry ( second time in double checked locking )<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      // And it's already a miss then the l2 will also be a miss.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      if (victimHandler != null &amp;&amp; !repeat) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        // The handler will increase result's refCnt for RPC, so need no extra retain.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        Cacheable result = victimHandler.getBlock(cacheKey, caching, repeat, updateCacheMetrics);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        // Promote this to L1.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        if (result != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          if (caching) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            cacheBlock(cacheKey, result, /* inMemory = */ false);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        return result;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return null;<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    if (updateCacheMetrics) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      stats.hit(caching, cacheKey.isPrimary(), cacheKey.getBlockType());<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    cb.access(count.incrementAndGet());<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    return cb.getBuffer();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>  }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>  /**<a name="line.553"></a>
+<span class="sourceLineNo">554</span>   * Whether the cache contains block with specified cacheKey<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * @return true if contains the block<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   */<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  @Override<a name="line.557"></a>
+<span class="sourceLineNo">558</span>  public boolean containsBlock(BlockCacheKey cacheKey) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    return map.containsKey(cacheKey);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>  @Override<a name="line.562"></a>
+<span class="sourceLineNo">563</span>  public boolean evictBlock(BlockCacheKey cacheKey) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    LruCachedBlock cb = map.get(cacheKey);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    return cb != null &amp;&amp; evictBlock(cb, false) &gt; 0;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>  }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>  /**<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   * Evicts all blocks for a specific HFile. This is an expensive operation implemented as a<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   * linear-time search through all blocks in the cache. Ideally this should be a search in a<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   * log-access-time map.<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * &lt;p&gt;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * This is used for evict-on-close to remove all blocks of a specific HFile.<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   * @return the number of blocks evicted<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   */<a name="line.575"></a>
+<span class="sourceLineNo">576</span>  @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span>  public int evictBlocksByHfileName(String hfileName) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    int numEvicted = 0;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    for (BlockCacheKey key : map.keySet()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if (key.getHfileName().equals(hfileName)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        if (evictBlock(key)) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          ++numEvicted;<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      }<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    if (victimHandler != null) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>      numEvicted += victimHandler.evictBlocksByHfileName(hfileName);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    return numEvicted;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * Evict the block, and it will be cached by the victim handler if exists &amp;amp;&amp;amp; block may be<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * read again later<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @param evictedByEvictionProcess true if the given block is evicted by EvictionThread<a name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @return the heap size of evicted block<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   */<a name="line.597"></a>
+<span class="sourceLineNo">598</span>  protected long evictBlock(LruCachedBlock block, boolean evictedByEvictionProcess) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    final MutableBoolean evicted = new MutableBoolean(false);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    // Note: 'map' must be a ConcurrentHashMap or the supplier may be invoked more than once.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    map.computeIfPresent(block.getCacheKey(), (k, v) -&gt; {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      // Run the victim handler before we remove the mapping in the L1 map. It must complete<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      // quickly because other removal or insertion operations can be blocked in the meantime.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (evictedByEvictionProcess &amp;&amp; victimHandler != null) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        victimHandler.cacheBlock(k, v.getBuffer());<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      }<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      // Decrease the block's reference count, and if refCount is 0, then it'll auto-deallocate. DO<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      // NOT move this up because if we do that then the victimHandler may access the buffer with<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      // refCnt = 0 which is disallowed.<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      v.getBuffer().release();<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      evicted.setTrue();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      // By returning null from the supplier we remove the mapping from the L1 map.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      return null;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    });<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    // If we didn't find anything to evict there is nothing more to do here.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    if (evicted.isFalse()) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return 0;<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    }<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    // We evicted the block so update L1 statistics.<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    updateSizeMetrics(block, true);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    long val = elements.decrementAndGet();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    if (LOG.isTraceEnabled()) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      long size = map.size();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      assertCounterSanity(size, val);<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    }<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    BlockType bt = block.getBuffer().getBlockType();<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (bt.isBloom()) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      bloomBlockElements.decrement();<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    } else if (bt.isIndex()) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      indexBlockElements.decrement();<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    } else if (bt.isData()) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      dataBlockElements.decrement();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    if (evictedByEvictionProcess) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span>      // When the eviction of the block happened because of invalidation of HFiles, no need to<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      // update the stats counter.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>      stats.evicted(block.getCachedTime(), block.getCacheKey().isPrimary());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    return block.heapSize();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
+<span class="sourceLineNo">643</span>   * Multi-threaded call to run the eviction process.<a name="line.643"></a>
+<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
+<span class="sourceLineNo">645</span>  private void runEviction() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span>    if (evictionThread == null || !evictionThread.isGo()) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      evict();<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      evictionThread.evict();<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>  boolean isEvictionInProgress() {<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    return evictionInProgress;<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
 <span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    try {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      evictionInProgress = true;<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      long currentSize = this.size.get();<a name="line.659"></a>
-<span class="sourceLineNo">660</span>      long bytesToFree = currentSize - minSize();<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span>      if (LOG.isTraceEnabled()) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span>      if (bytesToFree &lt;= 0) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        return;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      }<a name="line.669"></a>
+<span class="sourceLineNo">657</span>  long getOverhead() {<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    return overhead;<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span>  /**<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * Eviction method.<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   */<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  void evict() {<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>    // Ensure only one eviction at a time<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    if (!evictionLock.tryLock()) {<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      return;<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
 <span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>      // Instantiate priority buckets<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.674"></a>
+<span class="sourceLineNo">671</span>    try {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      evictionInProgress = true;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      long currentSize = this.size.get();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      long bytesToFree = currentSize - minSize();<a name="line.674"></a>
 <span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>      // Scan entire map putting into appropriate buckets<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        switch (cachedBlock.getPriority()) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>          case SINGLE: {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>            bucketSingle.add(cachedBlock);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>            break;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>          }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>          case MULTI: {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>            bucketMulti.add(cachedBlock);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>            break;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>          }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>          case MEMORY: {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>            bucketMemory.add(cachedBlock);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            break;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>          }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>      long bytesFreed = 0;<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        long s = bucketSingle.totalSize();<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        long m = bucketMulti.totalSize();<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        if (bytesToFree &gt; (s + m)) {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.699"></a>
-<span class="sourceLineNo">700</span>          // so the single and multi buckets will be emptied<a name="line.700"></a>
-<span class="sourceLineNo">701</span>          bytesFreed = bucketSingle.free(s);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>          bytesFreed += bucketMulti.free(m);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>          if (LOG.isTraceEnabled()) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>            LOG.trace(<a name="line.704"></a>
-<span class="sourceLineNo">705</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.705"></a>
-<span class="sourceLineNo">706</span>          }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>          if (LOG.isTraceEnabled()) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            LOG.trace(<a name="line.709"></a>
-<span class="sourceLineNo">710</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        } else {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>          // this means no need to evict block in memory bucket,<a name="line.713"></a>
-<span class="sourceLineNo">714</span>          // and we try best to make the ratio between single-bucket and<a name="line.714"></a>
-<span class="sourceLineNo">715</span>          // multi-bucket is 1:2<a name="line.715"></a>
-<span class="sourceLineNo">716</span>          long bytesRemain = s + m - bytesToFree;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>          if (3 * s &lt;= bytesRemain) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            // single-bucket is small enough that no eviction happens for it<a name="line.718"></a>
-<span class="sourceLineNo">719</span>            // hence all eviction goes from multi-bucket<a name="line.719"></a>
-<span class="sourceLineNo">720</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            // hence all eviction goes from single-bucket<a name="line.723"></a>
-<span class="sourceLineNo">724</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>          } else {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>            // both buckets need to evict some blocks<a name="line.726"></a>
-<span class="sourceLineNo">727</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>            }<a name="line.730"></a>
-<span class="sourceLineNo">731</span>          }<a name="line.731"></a>
-<span class="sourceLineNo">732</span>        }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>        bucketQueue.add(bucketSingle);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        bucketQueue.add(bucketMulti);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        bucketQueue.add(bucketMemory);<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>        int remainingBuckets = bucketQueue.size();<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>        BlockBucket bucket;<a name="line.742"></a>
-<span class="sourceLineNo">743</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>          long overflow = bucket.overflow();<a name="line.744"></a>
-<span class="sourceLineNo">745</span>          if (overflow &gt; 0) {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>            long bucketBytesToFree =<a name="line.746"></a>
-<span class="sourceLineNo">747</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>          remainingBuckets--;<a name="line.750"></a>
-<span class="sourceLineNo">751</span>        }<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      }<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (LOG.isTraceEnabled()) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        long single = bucketSingle.totalSize();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        long multi = bucketMulti.totalSize();<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        long memory = bucketMemory.totalSize();<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        LOG.trace(<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.758"></a>
-<span class="sourceLineNo">759</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.759"></a>
-<span class="sourceLineNo">760</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.760"></a>
-<span class="sourceLineNo">761</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    } finally {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      stats.evict();<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      evictionInProgress = false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      evictionLock.unlock();<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>  }<a name="line.768"></a>
-<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span>  @Override<a name="line.770"></a>
-<span class="sourceLineNo">771</span>  public String toString() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.772"></a>
-<span class="sourceLineNo">773</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.774"></a>
-<span class="sourceLineNo">775</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      .toString();<a name="line.780"></a>
-<span class="sourceLineNo">781</span>  }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span>  /**<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.788"></a>
-<span class="sourceLineNo">789</span><a name="line.789"></a>
-<span class="sourceLineNo">790</span>    private final String name;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    private LruCachedBlockQueue queue;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    private long totalSize = 0;<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    private long bucketSize;<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>      this.name = name;<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      this.bucketSize = bucketSize;<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      totalSize = 0;<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    }<a name="line.800"></a>
-<span class="sourceLineNo">801</span><a name="line.801"></a>
-<span class="sourceLineNo">802</span>    public void add(LruCachedBlock block) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      totalSize += block.heapSize();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      queue.add(block);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    public long free(long toFree) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (LOG.isTraceEnabled()) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      LruCachedBlock cb;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      long freedBytes = 0;<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      while ((cb = queue.pollLast()) != null) {<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        freedBytes += evictBlock(cb, true);<a name="line.814"></a>
-<span class="sourceLineNo">815</span>        if (freedBytes &gt;= toFree) {<a name="line.815"></a>
-<span class="sourceLineNo">816</span>          return freedBytes;<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        }<a name="line.817"></a>
-<span class="sourceLineNo">818</span>      }<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      if (LOG.isTraceEnabled()) {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      }<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      return freedBytes;<a name="line.822"></a>
-<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span>    public long overflow() {<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      return totalSize - bucketSize;<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>    public long totalSize() {<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      return totalSize;<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span>    @Override<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    public int compareTo(BlockBucket that) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>    @Override<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    public boolean equals(Object that) {<a name="line.839"></a>
-<span class="sourceLineNo">840</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span>        return false;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>      }<a name="line.842"></a>
-<span class="sourceLineNo">843</span>      return compareTo((BlockBucket) that) == 0;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    }<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    @Override<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    public int hashCode() {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    }<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    @Override<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    public String toString() {<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.853"></a>
-<span class="sourceLineNo">854</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.854"></a>
-<span class="sourceLineNo">855</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    }<a name="line.856"></a>
-<span class="sourceLineNo">857</span>  }<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>  /**<a name="line.859"></a>
-<span class="sourceLineNo">860</span>   * Get the maximum size of this cache.<a name="line.860"></a>
-<span class="sourceLineNo">861</span>   * @return max size in bytes<a name="line.861"></a>
-<span class="sourceLineNo">862</span>   */<a name="line.862"></a>
-<span class="sourceLineNo">863</span><a name="line.863"></a>
-<span class="sourceLineNo">864</span>  @Override<a name="line.864"></a>
-<span class="sourceLineNo">865</span>  public long getMaxSize() {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    return this.maxSize;<a name="line.866"></a>
-<span class="sourceLineNo">867</span>  }<a name="line.867"></a>
-<span class="sourceLineNo">868</span><a name="line.868"></a>
-<span class="sourceLineNo">869</span>  @Override<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  public long getCurrentSize() {<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    return this.size.get();<a name="line.871"></a>
-<span class="sourceLineNo">872</span>  }<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>  @Override<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  public long getCurrentDataSize() {<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    return this.dataBlockSize.sum();<a name="line.876"></a>
-<span class="sourceLineNo">877</span>  }<a name="line.877"></a>
-<span class="sourceLineNo">878</span><a name="line.878"></a>
-<span class="sourceLineNo">879</span>  public long getCurrentIndexSize() {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    return this.indexBlockSize.sum();<a name="line.880"></a>
+<span class="sourceLineNo">676</span>      if (LOG.isTraceEnabled()) {<a name="line.676"></a>
+<span class="sourceLineNo">677</span>        LOG.trace("Block cache LRU eviction started; Attempting to free "<a name="line.677"></a>
+<span class="sourceLineNo">678</span>          + StringUtils.byteDesc(bytesToFree) + " of total=" + StringUtils.byteDesc(currentSize));<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      }<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>      if (bytesToFree &lt;= 0) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        return;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>      // Instantiate priority buckets<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      BlockBucket bucketSingle = new BlockBucket("single", bytesToFree, blockSize, singleSize());<a name="line.686"></a>
+<span class="sourceLineNo">687</span>      BlockBucket bucketMulti = new BlockBucket("multi", bytesToFree, blockSize, multiSize());<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      BlockBucket bucketMemory = new BlockBucket("memory", bytesToFree, blockSize, memorySize());<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>      // Scan entire map putting into appropriate buckets<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      for (LruCachedBlock cachedBlock : map.values()) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>        switch (cachedBlock.getPriority()) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span>          case SINGLE: {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            bucketSingle.add(cachedBlock);<a name="line.694"></a>
+<span class="sourceLineNo">695</span>            break;<a name="line.695"></a>
+<span class="sourceLineNo">696</span>          }<a name="line.696"></a>
+<span class="sourceLineNo">697</span>          case MULTI: {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>            bucketMulti.add(cachedBlock);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>            break;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>          }<a name="line.700"></a>
+<span class="sourceLineNo">701</span>          case MEMORY: {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>            bucketMemory.add(cachedBlock);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>            break;<a name="line.703"></a>
+<span class="sourceLineNo">704</span>          }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>        }<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>      long bytesFreed = 0;<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      if (forceInMemory || memoryFactor &gt; 0.999f) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        long s = bucketSingle.totalSize();<a name="line.710"></a>
+<span class="sourceLineNo">711</span>        long m = bucketMulti.totalSize();<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        if (bytesToFree &gt; (s + m)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>          // this means we need to evict blocks in memory bucket to make room,<a name="line.713"></a>
+<span class="sourceLineNo">714</span>          // so the single and multi buckets will be emptied<a name="line.714"></a>
+<span class="sourceLineNo">715</span>          bytesFreed = bucketSingle.free(s);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>          bytesFreed += bucketMulti.free(m);<a name="line.716"></a>
+<span class="sourceLineNo">717</span>          if (LOG.isTraceEnabled()) {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>            LOG.trace(<a name="line.718"></a>
+<span class="sourceLineNo">719</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " from single and multi buckets");<a name="line.719"></a>
+<span class="sourceLineNo">720</span>          }<a name="line.720"></a>
+<span class="sourceLineNo">721</span>          bytesFreed += bucketMemory.free(bytesToFree - bytesFreed);<a name="line.721"></a>
+<span class="sourceLineNo">722</span>          if (LOG.isTraceEnabled()) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>            LOG.trace(<a name="line.723"></a>
+<span class="sourceLineNo">724</span>              "freed " + StringUtils.byteDesc(bytesFreed) + " total from all three buckets ");<a name="line.724"></a>
+<span class="sourceLineNo">725</span>          }<a name="line.725"></a>
+<span class="sourceLineNo">726</span>        } else {<a name="line.726"></a>
+<span class="sourceLineNo">727</span>          // this means no need to evict block in memory bucket,<a name="line.727"></a>
+<span class="sourceLineNo">728</span>          // and we try best to make the ratio between single-bucket and<a name="line.728"></a>
+<span class="sourceLineNo">729</span>          // multi-bucket is 1:2<a name="line.729"></a>
+<span class="sourceLineNo">730</span>          long bytesRemain = s + m - bytesToFree;<a name="line.730"></a>
+<span class="sourceLineNo">731</span>          if (3 * s &lt;= bytesRemain) {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>            // single-bucket is small enough that no eviction happens for it<a name="line.732"></a>
+<span class="sourceLineNo">733</span>            // hence all eviction goes from multi-bucket<a name="line.733"></a>
+<span class="sourceLineNo">734</span>            bytesFreed = bucketMulti.free(bytesToFree);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>          } else if (3 * m &lt;= 2 * bytesRemain) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>            // multi-bucket is small enough that no eviction happens for it<a name="line.736"></a>
+<span class="sourceLineNo">737</span>            // hence all eviction goes from single-bucket<a name="line.737"></a>
+<span class="sourceLineNo">738</span>            bytesFreed = bucketSingle.free(bytesToFree);<a name="line.738"></a>
+<span class="sourceLineNo">739</span>          } else {<a name="line.739"></a>
+<span class="sourceLineNo">740</span>            // both buckets need to evict some blocks<a name="line.740"></a>
+<span class="sourceLineNo">741</span>            bytesFreed = bucketSingle.free(s - bytesRemain / 3);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>            if (bytesFreed &lt; bytesToFree) {<a name="line.742"></a>
+<span class="sourceLineNo">743</span>              bytesFreed += bucketMulti.free(bytesToFree - bytesFreed);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>            }<a name="line.744"></a>
+<span class="sourceLineNo">745</span>          }<a name="line.745"></a>
+<span class="sourceLineNo">746</span>        }<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      } else {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        PriorityQueue&lt;BlockBucket&gt; bucketQueue = new PriorityQueue&lt;&gt;(3);<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span>        bucketQueue.add(bucketSingle);<a name="line.750"></a>
+<span class="sourceLineNo">751</span>        bucketQueue.add(bucketMulti);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>        bucketQueue.add(bucketMemory);<a name="line.752"></a>
+<span class="sourceLineNo">753</span><a name="line.753"></a>
+<span class="sourceLineNo">754</span>        int remainingBuckets = bucketQueue.size();<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>        BlockBucket bucket;<a name="line.756"></a>
+<span class="sourceLineNo">757</span>        while ((bucket = bucketQueue.poll()) != null) {<a name="line.757"></a>
+<span class="sourceLineNo">758</span>          long overflow = bucket.overflow();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>          if (overflow &gt; 0) {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>            long bucketBytesToFree =<a name="line.760"></a>
+<span class="sourceLineNo">761</span>              Math.min(overflow, (bytesToFree - bytesFreed) / remainingBuckets);<a name="line.761"></a>
+<span class="sourceLineNo">762</span>            bytesFreed += bucket.free(bucketBytesToFree);<a name="line.762"></a>
+<span class="sourceLineNo">763</span>          }<a name="line.763"></a>
+<span class="sourceLineNo">764</span>          remainingBuckets--;<a name="line.764"></a>
+<span class="sourceLineNo">765</span>        }<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>      if (LOG.isTraceEnabled()) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        long single = bucketSingle.totalSize();<a name="line.768"></a>
+<span class="sourceLineNo">769</span>        long multi = bucketMulti.totalSize();<a name="line.769"></a>
+<span class="sourceLineNo">770</span>        long memory = bucketMemory.totalSize();<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        LOG.trace(<a name="line.771"></a>
+<span class="sourceLineNo">772</span>          "Block cache LRU eviction completed; " + "freed=" + StringUtils.byteDesc(bytesFreed)<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            + ", " + "total=" + StringUtils.byteDesc(this.size.get()) + ", " + "single="<a name="line.773"></a>
+<span class="sourceLineNo">774</span>            + StringUtils.byteDesc(single) + ", " + "multi=" + StringUtils.byteDesc(multi) + ", "<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            + "memory=" + StringUtils.byteDesc(memory));<a name="line.775"></a>
+<span class="sourceLineNo">776</span>      }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    } finally {<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      stats.evict();<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      evictionInProgress = false;<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      evictionLock.unlock();<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  @Override<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  public String toString() {<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    return MoreObjects.toStringHelper(this).add("blockCount", getBlockCount())<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      .add("currentSize", StringUtils.byteDesc(getCurrentSize()))<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      .add("freeSize", StringUtils.byteDesc(getFreeSize()))<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      .add("maxSize", StringUtils.byteDesc(getMaxSize()))<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      .add("heapSize", StringUtils.byteDesc(heapSize()))<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      .add("minSize", StringUtils.byteDesc(minSize())).add("minFactor", minFactor)<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      .add("multiSize", StringUtils.byteDesc(multiSize())).add("multiFactor", multiFactor)<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      .add("singleSize", StringUtils.byteDesc(singleSize())).add("singleFactor", singleFactor)<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      .toString();<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
+<span class="sourceLineNo">796</span><a name="line.796"></a>
+<span class="sourceLineNo">797</span>  /**<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * Used to group blocks into priority buckets. There will be a BlockBucket for each priority<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate number of<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * elements out of each according to configuration parameters and their relatives sizes.<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   */<a name="line.801"></a>
+<span class="sourceLineNo">802</span>  private class BlockBucket implements Comparable&lt;BlockBucket&gt; {<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span>    private final String name;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>    private LruCachedBlockQueue queue;<a name="line.805"></a>
+<span class="sourceLineNo">806</span>    private long totalSize = 0;<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    private long bucketSize;<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>    public BlockBucket(String name, long bytesToFree, long blockSize, long bucketSize) {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      this.name = name;<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      this.bucketSize = bucketSize;<a name="line.811"></a>
+<span class="sourceLineNo">812</span>      queue = new LruCachedBlockQueue(bytesToFree, blockSize);<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      totalSize = 0;<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span><a name="line.815"></a>
+<span class="sourceLineNo">816</span>    public void add(LruCachedBlock block) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      totalSize += block.heapSize();<a name="line.817"></a>
+<span class="sourceLineNo">818</span>      queue.add(block);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    }<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>    public long free(long toFree) {<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      if (LOG.isTraceEnabled()) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span>        LOG.trace("freeing " + StringUtils.byteDesc(toFree) + " from " + this);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      }<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      LruCachedBlock cb;<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      long freedBytes = 0;<a name="line.826"></a>
+<span class="sourceLineNo">827</span>      while ((cb = queue.pollLast()) != null) {<a name="line.827"></a>
+<span class="sourceLineNo">828</span>        freedBytes += evictBlock(cb, true);<a name="line.828"></a>
+<span class="sourceLineNo">829</span>        if (freedBytes &gt;= toFree) {<a name="line.829"></a>
+<span class="sourceLineNo">830</span>          return freedBytes;<a name="line.830"></a>
+<span class="sourceLineNo">831</span>        }<a name="line.831"></a>
+<span class="sourceLineNo">832</span>      }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>      if (LOG.isTraceEnabled()) {<a name="line.833"></a>
+<span class="sourceLineNo">834</span>        LOG.trace("freed " + StringUtils.byteDesc(freedBytes) + " from " + this);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      }<a name="line.835"></a>
+<span class="sourceLineNo">836</span>      return freedBytes;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    }<a name="line.837"></a>
+<span class="sourceLineNo">838</span><a name="line.838"></a>
+<span class="sourceLineNo">839</span>    public long overflow() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      return totalSize - bucketSize;<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    }<a name="line.841"></a>
+<span class="sourceLineNo">842</span><a name="line.842"></a>
+<span class="sourceLineNo">843</span>    public long totalSize() {<a name="line.843"></a>
+<span class="sourceLineNo">844</span>      return totalSize;<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    }<a name="line.845"></a>
+<span class="sourceLineNo">846</span><a name="line.846"></a>
+<span class="sourceLineNo">847</span>    @Override<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    public int compareTo(BlockBucket that) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      return Long.compare(this.overflow(), that.overflow());<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    }<a name="line.850"></a>
+<span class="sourceLineNo">851</span><a name="line.851"></a>
+<span class="sourceLineNo">852</span>    @Override<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    public boolean equals(Object that) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      if (that == null || !(that instanceof BlockBucket)) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>        return false;<a name="line.855"></a>
+<span class="sourceLineNo">856</span>      }<a name="line.856"></a>
+<span class="sourceLineNo">857</span>      return compareTo((BlockBucket) that) == 0;<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    }<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span>    @Override<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    public int hashCode() {<a name="line.861"></a>
+<span class="sourceLineNo">862</span>      return Objects.hashCode(name, bucketSize, queue, totalSize);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    }<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>    @Override<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    public String toString() {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>      return MoreObjects.toStringHelper(this).add("name", name)<a name="line.867"></a>
+<span class="sourceLineNo">868</span>        .add("totalSize", StringUtils.byteDesc(totalSize))<a name="line.868"></a>
+<span class="sourceLineNo">869</span>        .add("bucketSize", StringUtils.byteDesc(bucketSize)).toString();<a name="line.869"></a>
+<span class="sourceLineNo">870</span>    }<a name="line.870"></a>
+<span class="sourceLineNo">871</span>  }<a name="line.871"></a>
+<span class="sourceLineNo">872</span><a name="line.872"></a>
+<span class="sourceLineNo">873</span>  /**<a name="line.873"></a>
+<span class="sourceLineNo">874</span>   * Get the maximum size of this cache.<a name="line.874"></a>
+<span class="sourceLineNo">875</span>   * @return max size in bytes<a name="line.875"></a>
+<span class="sourceLineNo">876</span>   */<a name="line.876"></a>
+<span class="sourceLineNo">877</span><a name="line.877"></a>
+<span class="sourceLineNo">878</span>  @Override<a name="line.878"></a>
+<span class="sourceLineNo">879</span>  public long getMaxSize() {<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    return this.maxSize;<a name="line.880"></a>
 <span class="sourceLineNo">881</span>  }<a name="line.881"></a>
 <span class="sourceLineNo">882</span><a name="line.882"></a>
-<span class="sourceLineNo">883</span>  public long getCurrentBloomSize() {<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    return this.bloomBlockSize.sum();<a name="line.884"></a>
-<span class="sourceLineNo">885</span>  }<a name="line.885"></a>
-<span class="sourceLineNo">886</span><a name="line.886"></a>
-<span class="sourceLineNo">887</span>  @Override<a name="line.887"></a>
-<span class="sourceLineNo">888</span>  public long getFreeSize() {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    return getMaxSize() - getCurrentSize();<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  }<a name="line.890"></a>
-<span class="sourceLineNo">891</span><a name="line.891"></a>
-<span class="sourceLineNo">892</span>  @Override<a name="line.892"></a>
-<span class="sourceLineNo">893</span>  public long size() {<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    return getMaxSize();<a name="line.894"></a>
+<span class="sourceLineNo">883</span>  @Override<a name="line.883"></a>
+<span class="sourceLineNo">884</span>  public long getCurrentSize() {<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    return this.size.get();<a name="line.885"></a>
+<span class="sourceLineNo">886</span>  }<a name="line.886"></a>
+<span class="sourceLineNo">887</span><a name="line.887"></a>
+<span class="sourceLineNo">888</span>  @Override<a name="line.888"></a>
+<span class="sourceLineNo">889</span>  public long getCurrentDataSize() {<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    return this.dataBlockSize.sum();<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  public long getCurrentIndexSize() {<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    return this.indexBlockSize.sum();<a name="line.894"></a>
 <span class="sourceLineNo">895</span>  }<a name="line.895"></a>
 <span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  @Override<a name="line.897"></a>
-<span class="sourceLineNo">898</span>  public long getBlockCount() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    return this.elements.get();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>  }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>  @Override<a name="line.902"></a>
-<span class="sourceLineNo">903</span>  public long getDataBlockCount() {<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    return this.dataBlockElements.sum();<a name="line.904"></a>
-<span class="sourceLineNo">905</span>  }<a name="line.905"></a>
-<span class="sourceLineNo">906</span><a name="line.906"></a>
-<span class="sourceLineNo">907</span>  public long getIndexBlockCount() {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    return this.indexBlockElements.sum();<a name="line.908"></a>
+<span class="sourceLineNo">897</span>  public long getCurrentBloomSize() {<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    return this.bloomBlockSize.sum();<a name="line.898"></a>
+<span class="sourceLineNo">899</span>  }<a name="line.899"></a>
+<span class="sourceLineNo">900</span><a name="line.900"></a>
+<span class="sourceLineNo">901</span>  @Override<a name="line.901"></a>
+<span class="sourceLineNo">902</span>  public long getFreeSize() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    return getMaxSize() - getCurrentSize();<a name="line.903"></a>
+<span class="sourceLineNo">904</span>  }<a name="line.904"></a>
+<span class="sourceLineNo">905</span><a name="line.905"></a>
+<span class="sourceLineNo">906</span>  @Override<a name="line.906"></a>
+<span class="sourceLineNo">907</span>  public long size() {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    return getMaxSize();<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  public long getBloomBlockCount() {<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    return this.bloomBlockElements.sum();<a name="line.912"></a>
-<span class="sourceLineNo">913</span>  }<a name="line.913"></a>
-<span class="sourceLineNo">914</span><a name="line.914"></a>
-<span class="sourceLineNo">915</span>  EvictionThread getEvictionThread() {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    return this.evictionThread;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>  }<a name="line.917"></a>
-<span class="sourceLineNo">918</span><a name="line.918"></a>
-<span class="sourceLineNo">919</span>  /*<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.920"></a>
-<span class="sourceLineNo">921</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.921"></a>
-<span class="sourceLineNo">922</span>   * LruBlockCache#runEviction()}<a name="line.922"></a>
-<span class="sourceLineNo">923</span>   */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  static class EvictionThread extends Thread {<a name="line.924"></a>
-<span class="sourceLineNo">925</span><a name="line.925"></a>
-<span class="sourceLineNo">926</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    private volatile boolean go = true;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    // flag set after enter the run method, used for test<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    private boolean enteringRun = false;<a name="line.929"></a>
-<span class="sourceLineNo">930</span><a name="line.930"></a>
-<span class="sourceLineNo">931</span>    public EvictionThread(LruBlockCache cache) {<a name="line.931"></a>
-<span class="sourceLineNo">932</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      setDaemon(true);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    }<a name="line.935"></a>
-<span class="sourceLineNo">936</span><a name="line.936"></a>
-<span class="sourceLineNo">937</span>    @Override<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    public void run() {<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      enteringRun = true;<a name="line.939"></a>
-<span class="sourceLineNo">940</span>      while (this.go) {<a name="line.940"></a>
-<span class="sourceLineNo">941</span>        synchronized (this) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>          try {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.943"></a>
-<span class="sourceLineNo">944</span>          } catch (InterruptedException e) {<a name="line.944"></a>
-<span class="sourceLineNo">945</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.945"></a>
-<span class="sourceLineNo">946</span>            Thread.currentThread().interrupt();<a name="line.946"></a>
-<span class="sourceLineNo">947</span>          }<a name="line.947"></a>
-<span class="sourceLineNo">948</span>        }<a name="line.948"></a>
-<span class="sourceLineNo">949</span>        LruBlockCache cache = this.cache.get();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        if (cache == null) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>          this.go = false;<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          break;<a name="line.952"></a>
-<span class="sourceLineNo">953</span>        }<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        cache.evict();<a name="line.954"></a>
-<span class="sourceLineNo">955</span>      }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    }<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.958"></a>
-<span class="sourceLineNo">959</span>        justification = "This is what we want")<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    public void evict() {<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      synchronized (this) {<a name="line.961"></a>
-<span class="sourceLineNo">962</span>        this.notifyAll();<a name="line.962"></a>
-<span class="sourceLineNo">963</span>      }<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    }<a name="line.964"></a>
-<span class="sourceLineNo">965</span><a name="line.965"></a>
-<span class="sourceLineNo">966</span>    synchronized void shutdown() {<a name="line.966"></a>
-<span class="sourceLineNo">967</span>      this.go = false;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>      this.notifyAll();<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    }<a name="line.969"></a>
-<span class="sourceLineNo">970</span><a name="line.970"></a>
-<span class="sourceLineNo">971</span>    public boolean isGo() {<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      return go;<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    }<a name="line.973"></a>
-<span class="sourceLineNo">974</span><a name="line.974"></a>
-<span class="sourceLineNo">975</span>    /**<a name="line.975"></a>
-<span class="sourceLineNo">976</span>     * Used for the test.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>     */<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    boolean isEnteringRun() {<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      return this.enteringRun;<a name="line.979"></a>
-<span class="sourceLineNo">980</span>    }<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  }<a name="line.981"></a>
-<span class="sourceLineNo">982</span><a name="line.982"></a>
-<span class="sourceLineNo">983</span>  /*<a name="line.983"></a>
-<span class="sourceLineNo">984</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.984"></a>
-<span class="sourceLineNo">985</span>   */<a name="line.985"></a>
-<span class="sourceLineNo">986</span>  static class StatisticsThread extends Thread {<a name="line.986"></a>
-<span class="sourceLineNo">987</span><a name="line.987"></a>
-<span class="sourceLineNo">988</span>    private final LruBlockCache lru;<a name="line.988"></a>
-<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      super("LruBlockCacheStats");<a name="line.991"></a>
-<span class="sourceLineNo">992</span>      setDaemon(true);<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      this.lru = lru;<a name="line.993"></a>
+<span class="sourceLineNo">911</span>  @Override<a name="line.911"></a>
+<span class="sourceLineNo">912</span>  public long getBlockCount() {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    return this.elements.get();<a name="line.913"></a>
+<span class="sourceLineNo">914</span>  }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>  @Override<a name="line.916"></a>
+<span class="sourceLineNo">917</span>  public long getDataBlockCount() {<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    return this.dataBlockElements.sum();<a name="line.918"></a>
+<span class="sourceLineNo">919</span>  }<a name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>  public long getIndexBlockCount() {<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    return this.indexBlockElements.sum();<a name="line.922"></a>
+<span class="sourceLineNo">923</span>  }<a name="line.923"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span>  public long getBloomBlockCount() {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    return this.bloomBlockElements.sum();<a name="line.926"></a>
+<span class="sourceLineNo">927</span>  }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>  EvictionThread getEvictionThread() {<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    return this.evictionThread;<a name="line.930"></a>
+<span class="sourceLineNo">931</span>  }<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>  /*<a name="line.933"></a>
+<span class="sourceLineNo">934</span>   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   * above the acceptable level.&lt;p&gt; Thread is triggered into action by {@link<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   * LruBlockCache#runEviction()}<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   */<a name="line.937"></a>
+<span class="sourceLineNo">938</span>  static class EvictionThread extends Thread {<a name="line.938"></a>
+<span class="sourceLineNo">939</span><a name="line.939"></a>
+<span class="sourceLineNo">940</span>    private WeakReference&lt;LruBlockCache&gt; cache;<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    private volatile boolean go = true;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // flag set after enter the run method, used for test<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    private boolean enteringRun = false;<a name="line.943"></a>
+<span class="sourceLineNo">944</span><a name="line.944"></a>
+<span class="sourceLineNo">945</span>    public EvictionThread(LruBlockCache cache) {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      super(Thread.currentThread().getName() + ".LruBlockCache.EvictionThread");<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      setDaemon(true);<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      this.cache = new WeakReference&lt;&gt;(cache);<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    }<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>    @Override<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    public void run() {<a name="line.952"></a>
+<span class="sourceLineNo">953</span>      enteringRun = true;<a name="line.953"></a>
+<span class="sourceLineNo">954</span>      while (this.go) {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>        synchronized (this) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>          try {<a name="line.956"></a>
+<span class="sourceLineNo">957</span>            this.wait(1000 * 10/* Don't wait for ever */);<a name="line.957"></a>
+<span class="sourceLineNo">958</span>          } catch (InterruptedException e) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>            LOG.warn("Interrupted eviction thread ", e);<a name="line.959"></a>
+<span class="sourceLineNo">960</span>            Thread.currentThread().interrupt();<a name="line.960"></a>
+<span class="sourceLineNo">961</span>          }<a name="line.961"></a>
+<span class="sourceLineNo">962</span>        }<a name="line.962"></a>
+<span class="sourceLineNo">963</span>        LruBlockCache cache = this.cache.get();<a name="line.963"></a>
+<span class="sourceLineNo">964</span>        if (cache == null) {<a name="line.964"></a>
+<span class="sourceLineNo">965</span>          this.go = false;<a name="line.965"></a>
+<span class="sourceLineNo">966</span>          break;<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        }<a name="line.967"></a>
+<span class="sourceLineNo">968</span>        cache.evict();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>      }<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    }<a name="line.970"></a>
+<span class="sourceLineNo">971</span><a name="line.971"></a>
+<span class="sourceLineNo">972</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NN_NAKED_NOTIFY",<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        justification = "This is what we want")<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    public void evict() {<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      synchronized (this) {<a name="line.975"></a>
+<span class="sourceLineNo">976</span>        this.notifyAll();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      }<a name="line.977"></a>
+<span class="sourceLineNo">978</span>    }<a name="line.978"></a>
+<span class="sourceLineNo">979</span><a name="line.979"></a>
+<span class="sourceLineNo">980</span>    synchronized void shutdown() {<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      this.go = false;<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      this.notifyAll();<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    public boolean isGo() {<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      return go;<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span><a name="line.988"></a>
+<span class="sourceLineNo">989</span>    /**<a name="line.989"></a>
+<span class="sourceLineNo">990</span>     * Used for the test.<a name="line.990"></a>
+<span class="sourceLineNo">991</span>     */<a name="line.991"></a>
+<span class="sourceLineNo">992</span>    boolean isEnteringRun() {<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      return this.enteringRun;<a name="line.993"></a>
 <span class="sourceLineNo">994</span>    }<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>    @Override<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    public void run() {<a name="line.997"></a>
-<span class="sourceLineNo">998</span>      lru.logStats();<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    }<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>  }<a name="line.1000"></a>
+<span class="sourceLineNo">995</span>  }<a name="line.995"></a>
+<span class="sourceLineNo">996</span><a name="line.996"></a>
+<span class="sourceLineNo">997</span>  /*<a name="line.997"></a>
+<span class="sourceLineNo">998</span>   * Statistics thread. Periodically prints the cache statistics to the log.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>   */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>  static class StatisticsThread extends Thread {<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span><a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>  public void logStats() {<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    // Log size<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    long totalSize = heapSize();<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    long freeSize = maxSize - totalSize;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>      + (stats.getHitCount() == 0<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>        ? "0"<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      + (stats.getHitCachingCount() == 0<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>        ? "0,"<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  }<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span><a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>  /**<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>   * Get counter statistics for this cache.<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   * &lt;p&gt;<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>   */<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>  @Override<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>  public CacheStats getStats() {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    return this.stats;<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>  }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span><a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span><a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>  @Override<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  public long heapSize() {<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    return getCurrentSize();<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>  }<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span><a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  }<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>  @Override<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>      private final long now = System.nanoTime();<a name="line.1052"></a>
+<span class="sourceLineNo">1002</span>    private final LruBlockCache lru;<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span><a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    public StatisticsThread(LruBlockCache lru) {<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>      super("LruBlockCacheStats");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>      setDaemon(true);<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>      this.lru = lru;<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    }<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span><a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    @Override<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    public void run() {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      lru.logStats();<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>    }<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>  }<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span><a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>  public void logStats() {<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>    // Log size<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>    long totalSize = heapSize();<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>    long freeSize = maxSize - totalSize;<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>    LruBlockCache.LOG.info("totalSize=" + StringUtils.byteDesc(totalSize) + ", " + "freeSize="<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      + StringUtils.byteDesc(freeSize) + ", " + "max=" + StringUtils.byteDesc(this.maxSize) + ", "<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      + "blockCount=" + getBlockCount() + ", " + "accesses=" + stats.getRequestCount() + ", "<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      + "hits=" + stats.getHitCount() + ", " + "hitRatio="<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      + (stats.getHitCount() == 0<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>        ? "0"<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>        : (StringUtils.formatPercent(stats.getHitRatio(), 2) + ", "))<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>      + ", " + "cachingAccesses=" + stats.getRequestCachingCount() + ", " + "cachingHits="<a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>      + stats.getHitCachingCount() + ", " + "cachingHitsRatio="<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>      + (stats.getHitCachingCount() == 0<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>        ? "0,"<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>        : (StringUtils.formatPercent(stats.getHitCachingRatio(), 2) + ", "))<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>      + "evictions=" + stats.getEvictionCount() + ", " + "evicted=" + stats.getEvictedCount() + ", "<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      + "evictedPerRun=" + stats.evictedPerEviction());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span><a name="line.1035"></a>
+<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>   * Get counter statistics for this cache.<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>   * &lt;p&gt;<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>   * Includes: total accesses, hits, misses, evicted blocks, and runs of the eviction processes.<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>   */<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>  @Override<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>  public CacheStats getStats() {<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    return this.stats;<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>  }<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span><a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>  public final static long CACHE_FIXED_OVERHEAD =<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>    ClassSize.estimateBase(LruBlockCache.class, false);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span><a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>  @Override<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>  public long heapSize() {<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    return getCurrentSize();<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>      @Override<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>      public boolean hasNext() {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>        return iterator.hasNext();<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>      }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>      @Override<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      public CachedBlock next() {<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        final LruCachedBlock b = iterator.next();<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        return new CachedBlock() {<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>          @Override<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>          public String toString() {<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>            return BlockCacheUtil.toString(this, now);<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>          }<a name="line.1066"></a>
+<span class="sourceLineNo">1054</span>  private static long calculateOverhead(long maxSize, long blockSize, int concurrency) {<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    // FindBugs ICAST_INTEGER_MULTIPLY_CAST_TO_LONG<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>    return CACHE_FIXED_OVERHEAD + ClassSize.CONCURRENT_HASHMAP<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>      + ((long) Math.ceil(maxSize * 1.2 / blockSize) * ClassSize.CONCURRENT_HASHMAP_ENTRY)<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>      + ((long) concurrency * ClassSize.CONCURRENT_HASHMAP_SEGMENT);<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>  }<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span><a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  @Override<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>  public Iterator&lt;CachedBlock&gt; iterator() {<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>    final Iterator&lt;LruCachedBlock&gt; iterator = map.values().iterator();<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span><a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    return new Iterator&lt;CachedBlock&gt;() {<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>      private final long now = System.nanoTime();<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span><a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>          @Override<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>          public BlockPriority getBlockPriority() {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>            return b.getPriority();<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>          }<a name="line.1071"></a>
+<span class="sourceLineNo">1068</span>      @Override<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>      public boolean hasNext() {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>        return iterator.hasNext();<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>      }<a name="line.1071"></a>
 <span class="sourceLineNo">1072</span><a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>          @Override<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>          public BlockType getBlockType() {<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>            return b.getBuffer().getBlockType();<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>          }<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span><a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>          @Override<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>          public long getOffset() {<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>            return b.getCacheKey().getOffset();<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>          }<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span><a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>          @Override<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>          public long getSize() {<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>            return b.getBuffer().heapSize();<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>          }<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span><a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>          @Override<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>          public long getCachedTime() {<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>            return b.getCachedTime();<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>          }<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span><a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          @Override<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          public String getFilename() {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            return b.getCacheKey().getHfileName();<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          }<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span><a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          @Override<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>          public int compareTo(CachedBlock other) {<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>            if (diff != 0) {<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>              return diff;<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>            }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>            if (diff != 0) {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>              return diff;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>            }<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>            }<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>          }<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span><a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>          @Override<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>          public int hashCode() {<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>            return b.hashCode();<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>          }<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span><a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>          @Override<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>          public boolean equals(Object obj) {<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>            if (obj instanceof CachedBlock) {<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>              return compareTo(cb) == 0;<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>            } else {<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>              return false;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>            }<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>          }<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>        };<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>      }<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span><a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>      @Override<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>      public void remove() {<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>        throw new UnsupportedOperationException();<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>      }<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    };<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>  }<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span><a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span><a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>  long acceptableSize() {<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>  }<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span><a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>  private long minSize() {<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>  }<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>  private long singleSize() {<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1149"></a>
+<span class="sourceLineNo">1073</span>      @Override<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>      public CachedBlock next() {<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>        final LruCachedBlock b = iterator.next();<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>        return new CachedBlock() {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>          @Override<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>          public String toString() {<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>            return BlockCacheUtil.toString(this, now);<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>          }<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span><a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>          @Override<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>          public BlockPriority getBlockPriority() {<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>            return b.getPriority();<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>          }<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span><a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>          @Override<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>          public BlockType getBlockType() {<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>            return b.getBuffer().getBlockType();<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>          }<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span><a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>          @Override<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>          public long getOffset() {<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>            return b.getCacheKey().getOffset();<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>          }<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span><a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>          @Override<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>          public long getSize() {<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>            return b.getBuffer().heapSize();<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>          }<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>          @Override<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>          public long getCachedTime() {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>            return b.getCachedTime();<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>          }<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span><a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>          @Override<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>          public String getFilename() {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>            return b.getCacheKey().getHfileName();<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          }<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span><a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          @Override<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>          public int compareTo(CachedBlock other) {<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>            int diff = this.getFilename().compareTo(other.getFilename());<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            if (diff != 0) {<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>              return diff;<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>            }<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>            diff = Long.compare(this.getOffset(), other.getOffset());<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>            if (diff != 0) {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>              return diff;<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>            }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>            if (other.getCachedTime() &lt; 0 || this.getCachedTime() &lt; 0) {<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>              throw new IllegalStateException(this.getCachedTime() + ", " + other.getCachedTime());<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>            }<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>            return Long.compare(other.getCachedTime(), this.getCachedTime());<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>          }<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span><a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>          @Override<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>          public int hashCode() {<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>            return b.hashCode();<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>          }<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span><a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>          @Override<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>          public boolean equals(Object obj) {<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>            if (obj instanceof CachedBlock) {<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>              CachedBlock cb = (CachedBlock) obj;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>              return compareTo(cb) == 0;<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>            } else {<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>              return false;<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>            }<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>          }<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>        };<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>      }<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span><a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>      @Override<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>      public void remove() {<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>        throw new UnsupportedOperationException();<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span>      }<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>    };<a name="line.1149"></a>
 <span class="sourceLineNo">1150</span>  }<a name="line.1150"></a>
 <span class="sourceLineNo">1151</span><a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>  private long multiSize() {<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>  }<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span><a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>  private long memorySize() {<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>  }<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span><a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>  @Override<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>  public void shutdown() {<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>    if (victimHandler != null) {<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>      victimHandler.shutdown();<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>    }<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>    this.scheduleThreadPool.shutdown();<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>        try {<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>          Thread.sleep(10);<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>        } catch (InterruptedException e) {<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>          LOG.warn("Interrupted while sleeping");<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>          Thread.currentThread().interrupt();<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>          break;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>        }<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>      }<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    }<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span><a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>      LOG.debug("Still running " + runnables);<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>    }<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    this.evictionThread.shutdown();<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>  }<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>  /** Clears the cache. Used in tests. */<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>  public void clearCache() {<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>    this.map.clear();<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    this.elements.set(0);<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>  }<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span><a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>  /**<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>   * Used in testing. May be very inefficient.<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>   * @return the set of cached file names<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>   */<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    }<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    return fileNames;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>  }<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span><a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    for (LruCachedBlock block : map.values()) {<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>      Integer count = counts.get(encoding);<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    }<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    return counts;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>  }<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span><a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>    return map;<a name="line.1214"></a>
+<span class="sourceLineNo">1152</span>  // Simple calculators of sizes given factors and maxSize<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span><a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>  long acceptableSize() {<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    return (long) Math.floor(this.maxSize * this.acceptableFactor);<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>  }<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span><a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>  private long minSize() {<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>    return (long) Math.floor(this.maxSize * this.minFactor);<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>  }<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>  private long singleSize() {<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>    return (long) Math.floor(this.maxSize * this.singleFactor * this.minFactor);<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>  }<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span><a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>  private long multiSize() {<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>    return (long) Math.floor(this.maxSize * this.multiFactor * this.minFactor);<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>  }<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>  private long memorySize() {<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>    return (long) Math.floor(this.maxSize * this.memoryFactor * this.minFactor);<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>  }<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span><a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>  @Override<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>  public void shutdown() {<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>    if (victimHandler != null) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>      victimHandler.shutdown();<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>    }<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>    this.scheduleThreadPool.shutdown();<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>    for (int i = 0; i &lt; 10; i++) {<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span>      if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>        try {<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>          Thread.sleep(10);<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span>        } catch (InterruptedException e) {<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span>          LOG.warn("Interrupted while sleeping");<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>          Thread.currentThread().interrupt();<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span>          break;<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>        }<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>      }<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span>    }<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span><a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>    if (!this.scheduleThreadPool.isShutdown()) {<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span>      List&lt;Runnable&gt; runnables = this.scheduleThreadPool.shutdownNow();<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>      LOG.debug("Still running " + runnables);<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>    }<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span>    this.evictionThread.shutdown();<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>  }<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span><a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>  /** Clears the cache. Used in tests. */<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span>  public void clearCache() {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>    this.map.clear();<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>    this.elements.set(0);<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>  }<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span><a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>  /**<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>   * Used in testing. May be very inefficient.<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span>   * @return the set of cached file names<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>   */<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>  SortedSet&lt;String&gt; getCachedFileNamesForTest() {<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span>    SortedSet&lt;String&gt; fileNames = new TreeSet&lt;&gt;();<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>    for (BlockCacheKey cacheKey : map.keySet()) {<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>      fileNames.add(cacheKey.getHfileName());<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span>    }<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>    return fileNames;<a name="line.1214"></a>
 <span class="sourceLineNo">1215</span>  }<a name="line.1215"></a>
 <span class="sourceLineNo">1216</span><a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>  @Override<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>  public BlockCache[] getBlockCaches() {<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>    if (victimHandler != null) {<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>    }<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>    return null;<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>  }<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>}<a name="line.1224"></a>
+<span class="sourceLineNo">1217</span>  public Map&lt;DataBlockEncoding, Integer&gt; getEncodingCountsForTest() {<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>    Map&lt;DataBlockEncoding, Integer&gt; counts = new EnumMap&lt;&gt;(DataBlockEncoding.class);<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>    for (LruCachedBlock block : map.values()) {<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>      DataBlockEncoding encoding = ((HFileBlock) block.getBuffer()).getDataBlockEncoding();<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>      Integer count = counts.get(encoding);<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>      counts.put(encoding, (count == null ? 0 : count) + 1);<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>    }<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>    return counts;<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>  }<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span><a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>  Map&lt;BlockCacheKey, LruCachedBlock&gt; getMapForTests() {<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>    return map;<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span>  }<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span><a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>  @Override<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>  public BlockCache[] getBlockCaches() {<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>    if (victimHandler != null) {<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>      return new BlockCache[] { this, this.victimHandler };<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>    }<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span>    return null;<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>  }<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>}<a name="line.1238"></a>
 
 
 
diff --git a/downloads.html b/downloads.html
index 2630b67..ef45f50 100644
--- a/downloads.html
+++ b/downloads.html
@@ -415,7 +415,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/export_control.html b/export_control.html
index fff85ef..edc879a 100644
--- a/export_control.html
+++ b/export_control.html
@@ -205,7 +205,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/index.html b/index.html
index 6afe016..d5e40b3 100644
--- a/index.html
+++ b/index.html
@@ -278,7 +278,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/issue-management.html b/issue-management.html
index f2d34ff..b01a365 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -176,7 +176,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/licenses.html b/licenses.html
index daa2098..9065bfe 100644
--- a/licenses.html
+++ b/licenses.html
@@ -378,7 +378,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/mailing-lists.html b/mailing-lists.html
index c475ae1..58b71a0 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -223,7 +223,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/metrics.html b/metrics.html
index 70b3936..3edef1a 100644
--- a/metrics.html
+++ b/metrics.html
@@ -327,7 +327,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/old_news.html b/old_news.html
index 1a754a0..7e77939 100644
--- a/old_news.html
+++ b/old_news.html
@@ -324,7 +324,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugin-management.html b/plugin-management.html
index ac2d6ae..0d84991 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -329,7 +329,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugins.html b/plugins.html
index 73de0a2..e09aaba 100644
--- a/plugins.html
+++ b/plugins.html
@@ -263,7 +263,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index d2afb97..60961c3 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -658,7 +658,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-info.html b/project-info.html
index c8455a5..d8e3661 100644
--- a/project-info.html
+++ b/project-info.html
@@ -220,7 +220,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-reports.html b/project-reports.html
index 3529633..c8502a6 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -193,7 +193,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index 85dbc86..a8bf46d 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -182,7 +182,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/replication.html b/replication.html
index 90ab122..9c833f8 100644
--- a/replication.html
+++ b/replication.html
@@ -177,7 +177,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/resources.html b/resources.html
index b8a1803..d8804b2 100644
--- a/resources.html
+++ b/resources.html
@@ -200,7 +200,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/scm.html b/scm.html
index c18baa1..4f6a5ad 100644
--- a/scm.html
+++ b/scm.html
@@ -184,7 +184,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/sponsors.html b/sponsors.html
index c4f9565..ea30b13 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -206,7 +206,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/summary.html b/summary.html
index d066591..a181d36 100644
--- a/summary.html
+++ b/summary.html
@@ -217,7 +217,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/supportingprojects.html b/supportingprojects.html
index 9a177c0..73bae5e 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -396,7 +396,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/team.html b/team.html
index 1cd7065..ab6f96e 100644
--- a/team.html
+++ b/team.html
@@ -797,7 +797,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2023
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2023-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index f1c5abd..66b77ee 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -49538,6 +49538,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#setUpCellChunkMap-boolean-">setUpCellChunkMap(boolean)</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html" title="class in org.apache.hadoop.hbase.regionserver">TestCellFlatSet</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#setupClass--">setupClass()</a></span> - Static method in class org.apache.hadoop.hbase.io.compress.xerial.<a href="org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html" title="class in org.apache.hadoop.hbase.io.compress.xerial">TestSnappyCodec</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.html#setupClass--">setupClass()</a></span> - Static method in class org.apache.hadoop.hbase.io.crypto.tls.<a href="org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.html" title="class in org.apache.hadoop.hbase.io.crypto.tls">TestHBaseHostnameVerifier</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.html#setupClass--">setupClass()</a></span> - Static method in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.html" title="class in org.apache.hadoop.hbase.ipc">TestSecureSimpleRpcServer</a></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 31dd75e..04cb5e1 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -150,8 +150,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
index a300fd1..1d4667c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
@@ -114,7 +114,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.34">TestHFileCompressionSnappy</a>
+<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.36">TestHFileCompressionSnappy</a>
 extends <a href="../../../../../../../org/apache/hadoop/hbase/io/compress/HFileTestBase.html" title="class in org.apache.hadoop.hbase.io.compress">HFileTestBase</a></pre>
 </li>
 </ul>
@@ -224,7 +224,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>CLASS_RULE</h4>
-<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.37">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.39">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="conf">
@@ -233,7 +233,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>conf</h4>
-<pre>private static&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.40">conf</a></pre>
+<pre>private static&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.42">conf</a></pre>
 </li>
 </ul>
 </li>
@@ -250,7 +250,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestHFileCompressionSnappy</h4>
-<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.34">TestHFileCompressionSnappy</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.36">TestHFileCompressionSnappy</a>()</pre>
 </li>
 </ul>
 </li>
@@ -267,7 +267,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.43">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.45">setUpBeforeClass</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -281,7 +281,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>test</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.51">test</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html#line.54">test</a>()
           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
index d735f09..112885f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -114,7 +114,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.28">TestSnappyCodec</a>
+<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.31">TestSnappyCodec</a>
 extends <a href="../../../../../../../org/apache/hadoop/hbase/io/compress/CompressionTestBase.html" title="class in org.apache.hadoop.hbase.io.compress">CompressionTestBase</a></pre>
 </li>
 </ul>
@@ -172,21 +172,25 @@
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#testSnappyCodecLarge--">testSnappyCodecLarge</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#setupClass--">setupClass</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#testSnappyCodecSmall--">testSnappyCodecSmall</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#testSnappyCodecLarge--">testSnappyCodecLarge</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#testSnappyCodecSmall--">testSnappyCodecSmall</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#testSnappyCodecVeryLarge--">testSnappyCodecVeryLarge</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -224,7 +228,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CLASS_RULE</h4>
-<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.31">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.34">CLASS_RULE</a></pre>
 </li>
 </ul>
 </li>
@@ -241,7 +245,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestSnappyCodec</h4>
-<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.28">TestSnappyCodec</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.31">TestSnappyCodec</a>()</pre>
 </li>
 </ul>
 </li>
@@ -252,13 +256,27 @@
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="setupClass--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setupClass</h4>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.38">setupClass</a>()
+                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="testSnappyCodecSmall--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>testSnappyCodecSmall</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.35">testSnappyCodecSmall</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.43">testSnappyCodecSmall</a>()
                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -272,7 +290,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>testSnappyCodecLarge</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.40">testSnappyCodecLarge</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.48">testSnappyCodecLarge</a>()
                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -286,7 +304,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>testSnappyCodecVeryLarge</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.47">testSnappyCodecVeryLarge</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html#line.55">testSnappyCodecVeryLarge</a>()
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
index 0db7d0a..7ae70cc 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
@@ -114,7 +114,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.38">TestWALCompressionSnappy</a>
+<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.40">TestWALCompressionSnappy</a>
 extends <a href="../../../../../../../org/apache/hadoop/hbase/wal/CompressedWALTestBase.html" title="class in org.apache.hadoop.hbase.wal">CompressedWALTestBase</a></pre>
 </li>
 </ul>
@@ -228,7 +228,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>CLASS_RULE</h4>
-<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.41">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.43">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -237,7 +237,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>name</h4>
-<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.45">name</a></pre>
+<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.47">name</a></pre>
 </li>
 </ul>
 </li>
@@ -254,7 +254,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestWALCompressionSnappy</h4>
-<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.38">TestWALCompressionSnappy</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.40">TestWALCompressionSnappy</a>()</pre>
 </li>
 </ul>
 </li>
@@ -271,7 +271,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.48">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.50">setUpBeforeClass</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -285,7 +285,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDown</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.59">tearDown</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.62">tearDown</a>()
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -299,7 +299,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>test</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.64">test</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html#line.67">test</a>()
           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index dea5ed6..af30a87 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -690,20 +690,20 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">TestCustomPriorityRpcControllerFactory.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ZNodeClusterManager.CmdType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ZNodeClusterManager.CmdType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">TestCustomPriorityRpcControllerFactory.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.HealthSummary.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.HealthSummary</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ZNodeClusterManager.CmdType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ZNodeClusterManager.CmdType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index 39a133e..cffbf7f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,16 +81,16 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;)
-<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;)
+<ul>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager
 <ul>
 <li type="circle">org.apache.hadoop.hbase.procedure.MasterProcedureManager (implements org.apache.hadoop.hbase.Stoppable)
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 3b96c7a..b8923b9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -242,9 +242,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index e31c611..a611294 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -772,12 +772,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCompactionState.StateSource.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCompactionState.StateSource</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 8be1c63..71ce3d2 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -260,11 +260,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.GeneratorCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.GeneratorCounts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.VerifyCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.VerifyCounts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadCommonCrawl.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.GeneratorCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.GeneratorCounts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadCommonCrawl.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.VerifyCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.VerifyCounts</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 63d5965..b1704c5 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -207,9 +207,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
index 4a46f38..ed7c485 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestHFileCompressionSnappy.html
@@ -25,44 +25,47 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.io.compress.xerial;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.hadoop.conf.Configuration;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.hadoop.fs.Path;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseTestingUtil;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.io.compress.Compression;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.io.compress.HFileTestBase;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.junit.BeforeClass;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.junit.ClassRule;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.junit.Test;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.junit.experimental.categories.Category;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>@Category({ IOTests.class, SmallTests.class })<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class TestHFileCompressionSnappy extends HFileTestBase {<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>  @ClassRule<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    HBaseClassTestRule.forClass(TestHFileCompressionSnappy.class);<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>  private static Configuration conf;<a name="line.40"></a>
+<span class="sourceLineNo">020</span>import static org.junit.Assume.assumeTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.fs.Path;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseTestingUtil;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.io.compress.Compression;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.io.compress.HFileTestBase;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.junit.BeforeClass;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.junit.ClassRule;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.Test;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.experimental.categories.Category;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>@Category({ IOTests.class, SmallTests.class })<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class TestHFileCompressionSnappy extends HFileTestBase {<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>  @ClassRule<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    HBaseClassTestRule.forClass(TestHFileCompressionSnappy.class);<a name="line.40"></a>
 <span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  @BeforeClass<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  public static void setUpBeforeClass() throws Exception {<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    conf = TEST_UTIL.getConfiguration();<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    Compression.Algorithm.SNAPPY.reload(conf);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    HFileTestBase.setUpBeforeClass();<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @Test<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public void test() throws Exception {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    Path path =<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    doTest(conf, path, Compression.Algorithm.SNAPPY);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>}<a name="line.57"></a>
+<span class="sourceLineNo">042</span>  private static Configuration conf;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  @BeforeClass<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  public static void setUpBeforeClass() throws Exception {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    assumeTrue(SnappyCodec.isLoaded());<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    conf = TEST_UTIL.getConfiguration();<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    Compression.Algorithm.SNAPPY.reload(conf);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    HFileTestBase.setUpBeforeClass();<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  @Test<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  public void test() throws Exception {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    Path path =<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    doTest(conf, path, Compression.Algorithm.SNAPPY);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>}<a name="line.60"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
index 0473d0e..7121f2b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestSnappyCodec.html
@@ -25,38 +25,46 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.io.compress.xerial;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.hadoop.hbase.io.compress.CompressionTestBase;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.junit.ClassRule;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.junit.Test;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.junit.experimental.categories.Category;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>@Category(SmallTests.class)<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public class TestSnappyCodec extends CompressionTestBase {<a name="line.28"></a>
+<span class="sourceLineNo">020</span>import static org.junit.Assume.assumeTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.io.compress.CompressionTestBase;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.junit.BeforeClass;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.junit.ClassRule;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.junit.Test;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.junit.experimental.categories.Category;<a name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>  @ClassRule<a name="line.30"></a>
-<span class="sourceLineNo">031</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    HBaseClassTestRule.forClass(TestSnappyCodec.class);<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>  @Test<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  public void testSnappyCodecSmall() throws Exception {<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    codecSmallTest(new SnappyCodec());<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  }<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>  @Test<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  public void testSnappyCodecLarge() throws Exception {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    codecLargeTest(new SnappyCodec(), 1.1); // poor compressability<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    codecLargeTest(new SnappyCodec(), 2);<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    codecLargeTest(new SnappyCodec(), 10); // very high compressability<a name="line.43"></a>
-<span class="sourceLineNo">044</span>  }<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>  @Test<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  public void testSnappyCodecVeryLarge() throws Exception {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    codecVeryLargeTest(new SnappyCodec(), 3); // like text<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>}<a name="line.51"></a>
+<span class="sourceLineNo">030</span>@Category(SmallTests.class)<a name="line.30"></a>
+<span class="sourceLineNo">031</span>public class TestSnappyCodec extends CompressionTestBase {<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>  @ClassRule<a name="line.33"></a>
+<span class="sourceLineNo">034</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    HBaseClassTestRule.forClass(TestSnappyCodec.class);<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>  @BeforeClass<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  public static void setupClass() throws Exception {<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    assumeTrue(SnappyCodec.isLoaded());<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  }<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  @Test<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public void testSnappyCodecSmall() throws Exception {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    codecSmallTest(new SnappyCodec());<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  }<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  @Test<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  public void testSnappyCodecLarge() throws Exception {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    codecLargeTest(new SnappyCodec(), 1.1); // poor compressability<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    codecLargeTest(new SnappyCodec(), 2);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    codecLargeTest(new SnappyCodec(), 10); // very high compressability<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Test<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public void testSnappyCodecVeryLarge() throws Exception {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    codecVeryLargeTest(new SnappyCodec(), 3); // like text<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>}<a name="line.59"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
index a6cd8d9..eade19f 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/compress/xerial/TestWALCompressionSnappy.html
@@ -25,56 +25,59 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.io.compress.xerial;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.hadoop.conf.Configuration;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HConstants;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.TableName;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.io.compress.Compression;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.regionserver.wal.CompressionContext;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.wal.CompressedWALTestBase;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.junit.AfterClass;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.junit.BeforeClass;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.junit.ClassRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.junit.Rule;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.experimental.categories.Category;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.junit.rules.TestName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>@Category({ RegionServerTests.class, MediumTests.class })<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public class TestWALCompressionSnappy extends CompressedWALTestBase {<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>  @ClassRule<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    HBaseClassTestRule.forClass(TestWALCompressionSnappy.class);<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  @Rule<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public TestName name = new TestName();<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  @BeforeClass<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  public static void setUpBeforeClass() throws Exception {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    Configuration conf = TEST_UTIL.getConfiguration();<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    Compression.Algorithm.SNAPPY.reload(conf);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    conf.setBoolean(HConstants.ENABLE_WAL_COMPRESSION, true);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    conf.setBoolean(CompressionContext.ENABLE_WAL_VALUE_COMPRESSION, true);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    conf.set(CompressionContext.WAL_VALUE_COMPRESSION_TYPE, Compression.Algorithm.SNAPPY.getName());<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    TEST_UTIL.startMiniDFSCluster(3);<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @AfterClass<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static void tearDown() throws Exception {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    TEST_UTIL.shutdownMiniCluster();<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Test<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public void test() throws Exception {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    TableName tableName = TableName.valueOf(name.getMethodName().replaceAll("[^a-zA-Z0-9]", "_"));<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    doTest(tableName);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>}<a name="line.69"></a>
+<span class="sourceLineNo">020</span>import static org.junit.Assume.assumeTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HConstants;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.TableName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.io.compress.Compression;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.regionserver.wal.CompressionContext;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.wal.CompressedWALTestBase;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.junit.AfterClass;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.BeforeClass;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.ClassRule;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.Rule;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.Test;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.experimental.categories.Category;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.rules.TestName;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>@Category({ RegionServerTests.class, MediumTests.class })<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class TestWALCompressionSnappy extends CompressedWALTestBase {<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  @ClassRule<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    HBaseClassTestRule.forClass(TestWALCompressionSnappy.class);<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  @Rule<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  public TestName name = new TestName();<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  @BeforeClass<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public static void setUpBeforeClass() throws Exception {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    assumeTrue(SnappyCodec.isLoaded());<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    Configuration conf = TEST_UTIL.getConfiguration();<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    Compression.Algorithm.SNAPPY.reload(conf);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    conf.setBoolean(HConstants.ENABLE_WAL_COMPRESSION, true);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    conf.setBoolean(CompressionContext.ENABLE_WAL_VALUE_COMPRESSION, true);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    conf.set(CompressionContext.WAL_VALUE_COMPRESSION_TYPE, Compression.Algorithm.SNAPPY.getName());<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    TEST_UTIL.startMiniDFSCluster(3);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  @AfterClass<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public static void tearDown() throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    TEST_UTIL.shutdownMiniCluster();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  @Test<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public void test() throws Exception {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    TableName tableName = TableName.valueOf(name.getMethodName().replaceAll("[^a-zA-Z0-9]", "_"));<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    doTest(tableName);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>}<a name="line.72"></a>