You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/04/19 14:47:08 UTC
[41/43] hbase-site git commit: Published site at
556b22374423ff087c0583d02ae4298d4d4f2e6b.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/apidocs/org/apache/hadoop/hbase/util/VersionInfo.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/util/VersionInfo.html b/apidocs/org/apache/hadoop/hbase/util/VersionInfo.html
index 833a12e..e29d7bd 100644
--- a/apidocs/org/apache/hadoop/hbase/util/VersionInfo.html
+++ b/apidocs/org/apache/hadoop/hbase/util/VersionInfo.html
@@ -371,7 +371,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/util/VersionInfo.html#line.154">main</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>[] args)</pre>
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/util/VersionInfo.html#line.169">main</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>[] args)</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/apidocs/src-html/org/apache/hadoop/hbase/util/VersionInfo.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/util/VersionInfo.html b/apidocs/src-html/org/apache/hadoop/hbase/util/VersionInfo.html
index 7dbc29c..5cd476c 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/util/VersionInfo.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/util/VersionInfo.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -43,7 +43,7 @@
<span class="sourceLineNo">035</span><a name="line.35"></a>
<span class="sourceLineNo">036</span> // If between two dots there is not a number, we regard it as a very large number so it is<a name="line.36"></a>
<span class="sourceLineNo">037</span> // higher than any numbers in the version.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private static int VERY_LARGE_NUMBER = 100000;<a name="line.38"></a>
+<span class="sourceLineNo">038</span> private static final int VERY_LARGE_NUMBER = 100000;<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
<span class="sourceLineNo">040</span> /**<a name="line.40"></a>
<span class="sourceLineNo">041</span> * Get the hbase version.<a name="line.41"></a>
@@ -126,43 +126,58 @@
<span class="sourceLineNo">118</span> return 0;<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> String s1[] = v1.split("\\.|-");//1.2.3-hotfix -> [1, 2, 3, hotfix]<a name="line.121"></a>
-<span class="sourceLineNo">122</span> String s2[] = v2.split("\\.|-");<a name="line.122"></a>
+<span class="sourceLineNo">121</span> Object[] v1Comps = getVersionComponents(v1); //1.2.3-hotfix -> [1, 2, 3, hotfix]<a name="line.121"></a>
+<span class="sourceLineNo">122</span> Object[] v2Comps = getVersionComponents(v2);<a name="line.122"></a>
<span class="sourceLineNo">123</span> int index = 0;<a name="line.123"></a>
-<span class="sourceLineNo">124</span> while (index < s1.length && index < s2.length) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> int va = VERY_LARGE_NUMBER, vb = VERY_LARGE_NUMBER;<a name="line.125"></a>
-<span class="sourceLineNo">126</span> try {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> va = Integer.parseInt(s1[index]);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> } catch (Exception ingore) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> try {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> vb = Integer.parseInt(s2[index]);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> } catch (Exception ingore) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (va != vb) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return va - vb;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (va == VERY_LARGE_NUMBER) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> // compare as String<a name="line.138"></a>
-<span class="sourceLineNo">139</span> int c = s1[index].compareTo(s2[index]);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> if (c != 0) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return c;<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> index++;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (index < s1.length) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // s1 is longer<a name="line.147"></a>
-<span class="sourceLineNo">148</span> return 1;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> //s2 is longer<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return -1;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> public static void main(String[] args) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> writeTo(System.out);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>}<a name="line.157"></a>
+<span class="sourceLineNo">124</span> while (index < v1Comps.length && index < v2Comps.length) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> int va = v1Comps[index] instanceof Integer ? (Integer)v1Comps[index] : VERY_LARGE_NUMBER;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> int vb = v2Comps[index] instanceof Integer ? (Integer)v2Comps[index] : VERY_LARGE_NUMBER;<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (va != vb) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return va - vb;<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (va == VERY_LARGE_NUMBER) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> // here, va and vb components must be same and Strings, compare as String<a name="line.132"></a>
+<span class="sourceLineNo">133</span> int c = ((String)v1Comps[index]).compareTo((String)v2Comps[index]);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (c != 0) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return c;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span> index++;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span> if (index < v1Comps.length) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> // v1 is longer<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return 1;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> //v2 is longer<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<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> * Returns the version components as Integer and String objects<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * Examples: "1.2.3" returns [1, 2, 3], "4.5.6-SNAPSHOT" returns [4, 5, 6, "SNAPSHOT"]<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return the components of the version string<a name="line.151"></a>
+<span class="sourceLineNo">152</span> */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> static Object[] getVersionComponents(final String version) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> assert(version != null);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> Object[] strComps = version.split("[\\.-]");<a name="line.155"></a>
+<span class="sourceLineNo">156</span> assert(strComps.length > 0);<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> Object[] comps = new Object[strComps.length];<a name="line.158"></a>
+<span class="sourceLineNo">159</span> for (int i = 0; i < strComps.length; ++i) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> try {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> comps[i] = Integer.parseInt((String) strComps[i]);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> } catch (NumberFormatException e) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> comps[i] = strComps[i];<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return comps;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> public static void main(String[] args) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> writeTo(System.out);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>}<a name="line.172"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index ed082c7..4212d1d 100644
--- a/book.html
+++ b/book.html
@@ -3082,6 +3082,21 @@ Some configurations would only appear in source code; the only way to identify t
</dd>
</dl>
</div>
+<div id="hbase.normalizer.min.region.count" class="dlist">
+<dl>
+<dt class="hdlist1"><code>hbase.normalizer.min.region.count</code></dt>
+<dd>
+<div class="paragraph">
+<div class="title">Description</div>
+<p>configure the minimum number of regions</p>
+</div>
+<div class="paragraph">
+<div class="title">Default</div>
+<p><code>3</code></p>
+</div>
+</dd>
+</dl>
+</div>
<div id="hbase.regions.slop" class="dlist">
<dl>
<dt class="hdlist1"><code>hbase.regions.slop</code></dt>
@@ -37715,7 +37730,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-04-18 14:29:52 UTC
+Last updated 2018-04-19 14:29:51 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 3d3f156..ef792c5 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="20180418" />
+ <meta name="Date-Revision-yyyymmdd" content="20180419" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-18</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-19</li>
</p>
</div>