http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bdd1f3f0/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index 02668c6..1b9f607 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -1686,21 +1686,46 @@ <span class="sourceLineNo">1678</span> List<SecurityCapability> getSecurityCapabilities() throws IOException;<a name="line.1678"></a> <span class="sourceLineNo">1679</span><a name="line.1679"></a> <span class="sourceLineNo">1680</span> /**<a name="line.1680"></a> -<span class="sourceLineNo">1681</span> * Currently, there are only two compact types:<a name="line.1681"></a> -<span class="sourceLineNo">1682</span> * {@code NORMAL} means do store files compaction;<a name="line.1682"></a> -<span class="sourceLineNo">1683</span> * {@code MOB} means do mob files compaction.<a name="line.1683"></a> -<span class="sourceLineNo">1684</span> * */<a name="line.1684"></a> -<span class="sourceLineNo">1685</span><a name="line.1685"></a> -<span class="sourceLineNo">1686</span> @InterfaceAudience.Public<a name="line.1686"></a> -<span class="sourceLineNo">1687</span> @InterfaceStability.Unstable<a name="line.1687"></a> -<span class="sourceLineNo">1688</span> public enum CompactType {<a name="line.1688"></a> -<span class="sourceLineNo">1689</span><a name="line.1689"></a> -<span class="sourceLineNo">1690</span> NORMAL (0),<a name="line.1690"></a> -<span class="sourceLineNo">1691</span> MOB (1);<a name="line.1691"></a> -<span class="sourceLineNo">1692</span><a name="line.1692"></a> -<span class="sourceLineNo">1693</span> CompactType(int value) {}<a name="line.1693"></a> -<span class="sourceLineNo">1694</span> }<a name="line.1694"></a> -<span class="sourceLineNo">1695</span>}<a name="line.1695"></a> +<span class="sourceLineNo">1681</span> * Turn the Split or Merge switches on or off.<a name="line.1681"></a> +<span class="sourceLineNo">1682</span> *<a name="line.1682"></a> +<span class="sourceLineNo">1683</span> * @param enabled enabled or not<a name="line.1683"></a> +<span class="sourceLineNo">1684</span> * @param synchronous If true, it waits until current split() call, if outstanding, to return.<a name="line.1684"></a> +<span class="sourceLineNo">1685</span> * @param switchTypes switchType list {@link MasterSwitchType}<a name="line.1685"></a> +<span class="sourceLineNo">1686</span> * @return Previous switch value array<a name="line.1686"></a> +<span class="sourceLineNo">1687</span> */<a name="line.1687"></a> +<span class="sourceLineNo">1688</span> boolean[] setSplitOrMergeEnabled(final boolean enabled, final boolean synchronous,<a name="line.1688"></a> +<span class="sourceLineNo">1689</span> final MasterSwitchType... switchTypes) throws IOException;<a name="line.1689"></a> +<span class="sourceLineNo">1690</span><a name="line.1690"></a> +<span class="sourceLineNo">1691</span> /**<a name="line.1691"></a> +<span class="sourceLineNo">1692</span> * Query the current state of the switch<a name="line.1692"></a> +<span class="sourceLineNo">1693</span> *<a name="line.1693"></a> +<span class="sourceLineNo">1694</span> * @return true if the switch is enabled, false otherwise.<a name="line.1694"></a> +<span class="sourceLineNo">1695</span> */<a name="line.1695"></a> +<span class="sourceLineNo">1696</span> boolean isSplitOrMergeEnabled(final MasterSwitchType switchType) throws IOException;<a name="line.1696"></a> +<span class="sourceLineNo">1697</span><a name="line.1697"></a> +<span class="sourceLineNo">1698</span> /**<a name="line.1698"></a> +<span class="sourceLineNo">1699</span> * Currently, there are only two compact types:<a name="line.1699"></a> +<span class="sourceLineNo">1700</span> * {@code NORMAL} means do store files compaction;<a name="line.1700"></a> +<span class="sourceLineNo">1701</span> * {@code MOB} means do mob files compaction.<a name="line.1701"></a> +<span class="sourceLineNo">1702</span> * */<a name="line.1702"></a> +<span class="sourceLineNo">1703</span> @InterfaceAudience.Public<a name="line.1703"></a> +<span class="sourceLineNo">1704</span> @InterfaceStability.Unstable<a name="line.1704"></a> +<span class="sourceLineNo">1705</span> public enum CompactType {<a name="line.1705"></a> +<span class="sourceLineNo">1706</span><a name="line.1706"></a> +<span class="sourceLineNo">1707</span> NORMAL (0),<a name="line.1707"></a> +<span class="sourceLineNo">1708</span> MOB (1);<a name="line.1708"></a> +<span class="sourceLineNo">1709</span><a name="line.1709"></a> +<span class="sourceLineNo">1710</span> CompactType(int value) {}<a name="line.1710"></a> +<span class="sourceLineNo">1711</span> }<a name="line.1711"></a> +<span class="sourceLineNo">1712</span> <a name="line.1712"></a> +<span class="sourceLineNo">1713</span> @InterfaceAudience.Public<a name="line.1713"></a> +<span class="sourceLineNo">1714</span> @InterfaceStability.Evolving<a name="line.1714"></a> +<span class="sourceLineNo">1715</span> public enum MasterSwitchType {<a name="line.1715"></a> +<span class="sourceLineNo">1716</span> SPLIT,<a name="line.1716"></a> +<span class="sourceLineNo">1717</span> MERGE<a name="line.1717"></a> +<span class="sourceLineNo">1718</span> }<a name="line.1718"></a> +<span class="sourceLineNo">1719</span><a name="line.1719"></a> +<span class="sourceLineNo">1720</span>}<a name="line.1720"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bdd1f3f0/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 32a0805..be73b1a 100644 --- a/book.html +++ b/book.html @@ -3609,11 +3609,11 @@ Configuration that it is thought rare anyone would change can exist only in code <dd> <div class="paragraph"> <div class="title">Description</div> -<p>The size of the buckets for the bucketcache if you only use a single size. Defaults to the default blocksize, which is 64 * 1024.</p> +<p>A float that EITHER represents a percentage of total heap memory size to give to the cache (if < 1.0) OR, it is the total capacity in megabytes of BucketCache. Default: 0.0</p> </div> <div class="paragraph"> <div class="title">Default</div> -<p><code>65536</code></p> +<p>none</p> </div> </dd> </dl> @@ -3624,7 +3624,7 @@ Configuration that it is thought rare anyone would change can exist only in code <dd> <div class="paragraph"> <div class="title">Description</div> -<p>A comma-separated list of sizes for buckets for the bucketcache if you use multiple sizes. Should be a list of block sizes in order from smallest to largest. The sizes you use will depend on your data access patterns.</p> +<p>A comma-separated list of sizes for buckets for the bucketcache. Can be multiple sizes. List block sizes in order from smallest to largest. The sizes you use will depend on your data access patterns. Must be a multiple of 1024 else you will run into 'java.io.IOException: Invalid HFile block magic' when you go to read from cache. If you specify no values here, then you pick up the default bucketsizes set in code (See BucketAllocator#DEFAULT_BUCKET_SIZES).</p> </div> <div class="paragraph"> <div class="title">Default</div> @@ -33244,7 +33244,7 @@ The server will return cellblocks compressed using this same compressor as long <div id="footer"> <div id="footer-text"> Version 2.0.0-SNAPSHOT<br> -Last updated 2016-02-26 18:35:15 UTC +Last updated 2016-02-29 14:48:24 UTC </div> </div> </body> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bdd1f3f0/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index ca7c1b7..de18a99 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20160226" /> + <meta name="Date-Revision-yyyymmdd" content="20160229" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -305,7 +305,7 @@ under the License. --> <a href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-02-26</li> + <li id="publishDate" class="pull-right">Last Published: 2016-02-29</li> </p> </div>
