http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/InvalidFamilyOperationException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/InvalidFamilyOperationException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/InvalidFamilyOperationException.html
index 04c610a..f2d209a 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/InvalidFamilyOperationException.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/InvalidFamilyOperationException.html
@@ -34,7 +34,7 @@
 <span class="sourceLineNo">026</span> */<a name="line.26"></a>
 <span class="sourceLineNo">027</span>@InterfaceAudience.Public<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>public class 
InvalidFamilyOperationException extends DoNotRetryIOException {<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 22 - 1L;<a name="line.29"></a>
+<span class="sourceLineNo">029</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 22) - 1L;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>  /** default constructor */<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>  public 
InvalidFamilyOperationException() {<a name="line.31"></a>
 <span class="sourceLineNo">032</span>    super();<a name="line.32"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/MasterNotRunningException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/MasterNotRunningException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/MasterNotRunningException.html
index f5492a6..f29ca61 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/MasterNotRunningException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/MasterNotRunningException.html
@@ -35,7 +35,7 @@
 <span class="sourceLineNo">027</span> */<a name="line.27"></a>
 <span class="sourceLineNo">028</span>@InterfaceAudience.Public<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>public class MasterNotRunningException 
extends IOException {<a name="line.29"></a>
-<span class="sourceLineNo">030</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 23 - 1L;<a name="line.30"></a>
+<span class="sourceLineNo">030</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 23) - 1L;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>  /** default constructor */<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>  public MasterNotRunningException() {<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span>    super();<a name="line.33"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.Builder.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.Builder.html 
b/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.Builder.html
index b24a194..8e3eb2f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.Builder.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.Builder.html
@@ -34,8 +34,8 @@
 <span class="sourceLineNo">026</span>import java.util.TreeMap;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.util.TreeSet;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>/**<a name="line.32"></a>
 <span class="sourceLineNo">033</span> * Namespace POJO class. Used to 
represent and define namespaces.<a name="line.33"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.html 
b/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.html
index b24a194..8e3eb2f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/NamespaceDescriptor.html
@@ -34,8 +34,8 @@
 <span class="sourceLineNo">026</span>import java.util.TreeMap;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.util.TreeSet;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>/**<a name="line.32"></a>
 <span class="sourceLineNo">033</span> * Namespace POJO class. Used to 
represent and define namespaces.<a name="line.33"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/NotServingRegionException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/NotServingRegionException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/NotServingRegionException.html
index b76ac8a..ac2a556 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/NotServingRegionException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/NotServingRegionException.html
@@ -37,7 +37,7 @@
 <span class="sourceLineNo">029</span> */<a name="line.29"></a>
 <span class="sourceLineNo">030</span>@InterfaceAudience.Public<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>public class NotServingRegionException 
extends IOException {<a name="line.31"></a>
-<span class="sourceLineNo">032</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 17 - 1L;<a name="line.32"></a>
+<span class="sourceLineNo">032</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 17) - 1L;<a name="line.32"></a>
 <span class="sourceLineNo">033</span><a name="line.33"></a>
 <span class="sourceLineNo">034</span>  /** default constructor */<a 
name="line.34"></a>
 <span class="sourceLineNo">035</span>  public NotServingRegionException() {<a 
name="line.35"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html 
b/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
index 3bef2d8..4f69045 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
@@ -32,10 +32,10 @@
 <span class="sourceLineNo">024</span>import java.util.Locale;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.util.regex.Pattern;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.net.Address;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.net.Address;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.net.InetAddresses;<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span><a name="line.33"></a>
@@ -330,80 +330,97 @@
 <span class="sourceLineNo">322</span><a name="line.322"></a>
 <span class="sourceLineNo">323</span>  @Override<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  public int compareTo(ServerName other) 
{<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    int compare = 
this.getHostname().compareToIgnoreCase(other.getHostname());<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>    if (compare != 0) return compare;<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>    compare = this.getPort() - 
other.getPort();<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    if (compare != 0) return compare;<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>    return 
Long.compare(this.getStartcode(), other.getStartcode());<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>  @Override<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public int hashCode() {<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>    return getServerName().hashCode();<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 boolean equals(Object o) {<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    if (this == o) return true;<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>    if (o == null) return false;<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>    if (!(o instanceof ServerName)) 
return false;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    return this.compareTo((ServerName)o) 
== 0;<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>  /**<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   * @param left<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   * @param right<a name="line.347"></a>
-<span class="sourceLineNo">348</span>   * @return True if 
&lt;code&gt;other&lt;/code&gt; has same hostname and port.<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>   */<a name="line.349"></a>
-<span class="sourceLineNo">350</span>  public static boolean 
isSameAddress(final ServerName left,<a name="line.350"></a>
-<span class="sourceLineNo">351</span>                                      
final ServerName right) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    // TODO: Make this 
left.getAddress().equals(right.getAddress())<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    if (left == null) return false;<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    if (right == null) return false;<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>    return 
left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &amp;&amp;<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>      left.getPort() == 
right.getPort();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>  }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>  /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * Use this method instantiating a 
{@link ServerName} from bytes<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * gotten from a call to {@link 
#getVersionedBytes()}.  Will take care of the<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * case where bytes were written by an 
earlier version of hbase.<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * @param versionedBytes Pass bytes 
gotten from a call to {@link #getVersionedBytes()}<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * @return A ServerName instance.<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @see #getVersionedBytes()<a 
name="line.365"></a>
+<span class="sourceLineNo">325</span>    int compare;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    if (other == null) {<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>      return -1;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    if (this.getHostname() == null) {<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>      if (other.getHostname() != null) 
{<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        return 1;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    } else {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      if (other.getHostname() == null) 
{<a name="line.334"></a>
+<span class="sourceLineNo">335</span>        return -1;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      compare = 
this.getHostname().compareToIgnoreCase(other.getHostname());<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>      if (compare != 0) {<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>        return compare;<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>      }<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    compare = this.getPort() - 
other.getPort();<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    if (compare != 0) {<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>      return compare;<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>    }<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    return 
Long.compare(this.getStartcode(), other.getStartcode());<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>  @Override<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  public int hashCode() {<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>    return getServerName().hashCode();<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>  @Override<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  public boolean equals(Object o) {<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>    if (this == o) return true;<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>    if (o == null) return false;<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (!(o instanceof ServerName)) 
return false;<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    return this.compareTo((ServerName)o) 
== 0;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>  /**<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * @param left<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * @param right<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * @return True if 
&lt;code&gt;other&lt;/code&gt; has same hostname and port.<a 
name="line.365"></a>
 <span class="sourceLineNo">366</span>   */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public static ServerName 
parseVersionedServerName(final byte [] versionedBytes) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    // Version is a short.<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>    short version = 
Bytes.toShort(versionedBytes);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    if (version == VERSION) {<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>      int length = versionedBytes.length 
- Bytes.SIZEOF_SHORT;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      return 
valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    // Presume the bytes were written 
with an old version of hbase and that the<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // bytes are actually a String of the 
form "'&lt;hostname&gt;' ':' '&lt;port&gt;'".<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return 
valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<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>  /**<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * @param str Either an instance of 
{@link ServerName#toString()} or a<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * "'&amp;lt;hostname&amp;gt;' ':' 
'&amp;lt;port&amp;gt;'".<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * @return A ServerName instance.<a 
name="line.382"></a>
+<span class="sourceLineNo">367</span>  public static boolean 
isSameAddress(final ServerName left,<a name="line.367"></a>
+<span class="sourceLineNo">368</span>                                      
final ServerName right) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    // TODO: Make this 
left.getAddress().equals(right.getAddress())<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    if (left == null) return false;<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>    if (right == null) return false;<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    return 
left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &amp;&amp;<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>      left.getPort() == 
right.getPort();<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  }<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span>  /**<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * Use this method instantiating a 
{@link ServerName} from bytes<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * gotten from a call to {@link 
#getVersionedBytes()}.  Will take care of the<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   * case where bytes were written by an 
earlier version of hbase.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * @param versionedBytes Pass bytes 
gotten from a call to {@link #getVersionedBytes()}<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @return A ServerName instance.<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @see #getVersionedBytes()<a 
name="line.382"></a>
 <span class="sourceLineNo">383</span>   */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public static ServerName 
parseServerName(final String str) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    return 
SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        valueOf(str, NON_STARTCODE);<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>  }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>  /**<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   * @return true if the String follows 
the pattern of {@link ServerName#toString()}, false<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   *  otherwise.<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   */<a name="line.393"></a>
-<span class="sourceLineNo">394</span>  public static boolean 
isFullServerName(final String str){<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    if (str == null ||str.isEmpty()) 
return false;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    return 
SERVERNAME_PATTERN.matcher(str).matches();<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>}<a name="line.398"></a>
+<span class="sourceLineNo">384</span>  public static ServerName 
parseVersionedServerName(final byte [] versionedBytes) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    // Version is a short.<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>    short version = 
Bytes.toShort(versionedBytes);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (version == VERSION) {<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>      int length = versionedBytes.length 
- Bytes.SIZEOF_SHORT;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      return 
valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>    }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // Presume the bytes were written 
with an old version of hbase and that the<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    // bytes are actually a String of the 
form "'&lt;hostname&gt;' ':' '&lt;port&gt;'".<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    return 
valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>  /**<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * @param str Either an instance of 
{@link ServerName#toString()} or a<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * "'&amp;lt;hostname&amp;gt;' ':' 
'&amp;lt;port&amp;gt;'".<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * @return A ServerName instance.<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>   */<a name="line.400"></a>
+<span class="sourceLineNo">401</span>  public static ServerName 
parseServerName(final String str) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    return 
SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        valueOf(str, NON_STARTCODE);<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>  }<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>  /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span>   * @return true if the String follows 
the pattern of {@link ServerName#toString()}, false<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   *  otherwise.<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   */<a name="line.410"></a>
+<span class="sourceLineNo">411</span>  public static boolean 
isFullServerName(final String str){<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    if (str == null ||str.isEmpty()) 
return false;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    return 
SERVERNAME_PATTERN.matcher(str).matches();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>}<a name="line.415"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/TableExistsException.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/TableExistsException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/TableExistsException.html
index f2056d6..83ce21e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/TableExistsException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/TableExistsException.html
@@ -33,7 +33,7 @@
 <span class="sourceLineNo">025</span> */<a name="line.25"></a>
 <span class="sourceLineNo">026</span>@InterfaceAudience.Public<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>public class TableExistsException extends 
DoNotRetryIOException {<a name="line.27"></a>
-<span class="sourceLineNo">028</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 7 - 1L;<a name="line.28"></a>
+<span class="sourceLineNo">028</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 7) - 1L;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>  /** default constructor */<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>  public TableExistsException() {<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>    super();<a name="line.31"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/TableName.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html 
b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html
index e809a27..8b176ae 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html
@@ -32,8 +32,8 @@
 <span class="sourceLineNo">024</span>import java.util.Set;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import 
java.util.concurrent.CopyOnWriteArraySet;<a name="line.25"></a>
 <span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.28"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
 <span class="sourceLineNo">030</span>/**<a name="line.30"></a>
 <span class="sourceLineNo">031</span> * Immutable POJO class for representing 
a table name.<a name="line.31"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/TableNotDisabledException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/TableNotDisabledException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/TableNotDisabledException.html
index 8888a3e..4954b4f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/TableNotDisabledException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/TableNotDisabledException.html
@@ -34,7 +34,7 @@
 <span class="sourceLineNo">026</span> */<a name="line.26"></a>
 <span class="sourceLineNo">027</span>@InterfaceAudience.Public<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>public class TableNotDisabledException 
extends DoNotRetryIOException {<a name="line.28"></a>
-<span class="sourceLineNo">029</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 19 - 1L;<a name="line.29"></a>
+<span class="sourceLineNo">029</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 19) - 1L;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>  /** default constructor */<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>  public TableNotDisabledException() {<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>    super();<a name="line.32"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/ZooKeeperConnectionException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/ZooKeeperConnectionException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/ZooKeeperConnectionException.html
index 797904a..4d3f878 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/ZooKeeperConnectionException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/ZooKeeperConnectionException.html
@@ -35,7 +35,7 @@
 <span class="sourceLineNo">027</span> */<a name="line.27"></a>
 <span class="sourceLineNo">028</span>@InterfaceAudience.Public<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>public class ZooKeeperConnectionException 
extends IOException {<a name="line.29"></a>
-<span class="sourceLineNo">030</span>  private static final long 
serialVersionUID = 1L &lt;&lt; 23 - 1L;<a name="line.30"></a>
+<span class="sourceLineNo">030</span>  private static final long 
serialVersionUID = (1L &lt;&lt; 23) - 1L;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>  /** default constructor */<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>  public ZooKeeperConnectionException() 
{<a name="line.32"></a>
 <span class="sourceLineNo">033</span>    super();<a name="line.33"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html
index 04766ab..bed985e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html
@@ -94,155 +94,157 @@
 <span class="sourceLineNo">086</span>   *          A client that is not 
interested in the result can save network<a name="line.86"></a>
 <span class="sourceLineNo">087</span>   *          bandwidth setting this to 
false.<a name="line.87"></a>
 <span class="sourceLineNo">088</span>   */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public Append setReturnResults(boolean 
returnResults) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    
super.setReturnResults(returnResults);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    return this;<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>  /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * @return current setting for 
returnResults<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  // This method makes public the 
superclasses's protected method.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public boolean isReturnResults() {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    return super.isReturnResults();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>  }<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>   * Create a Append operation for the 
specified row.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * &lt;p&gt;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * At least one column must be appended 
to.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * @param row row key; makes a local 
copy of passed in array.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  public Append(byte[] row) {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    this(row, 0, row.length);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * Copy constructor<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param a<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public Append(Append a) {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    this.row = a.getRow();<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    this.ts = a.getTimeStamp();<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    this.tr = a.getTimeRange();<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
this.familyMap.putAll(a.getFamilyCellMap());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    for (Map.Entry&lt;String, byte[]&gt; 
entry : a.getAttributesMap().entrySet()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      this.setAttribute(entry.getKey(), 
entry.getValue());<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    this.setPriority(a.getPriority());<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>  /** Create a Append operation for the 
specified row.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   * &lt;p&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   * At least one column must be appended 
to.<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * @param rowArray Makes a copy out of 
this buffer.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * @param rowOffset<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>   * @param rowLength<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>   */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  public Append(final byte [] rowArray, 
final int rowOffset, final int rowLength) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    checkRow(rowArray, rowOffset, 
rowLength);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    this.row = Bytes.copy(rowArray, 
rowOffset, rowLength);<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>  /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   * Add the specified column and value 
to this Append operation.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   * @param family family name<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>   * @param qualifier column qualifier<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>   * @param value value to append to 
specified column<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * @return this<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @deprecated As of release 2.0.0, 
this will be removed in HBase 3.0.0.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   *             Use {@link 
#addColumn(byte[], byte[], byte[])} instead<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  @Deprecated<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  public Append add(byte [] family, byte 
[] qualifier, byte [] value) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    return this.addColumn(family, 
qualifier, value);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * Add the specified column and value 
to this Append operation.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * @param family family name<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>   * @param qualifier column qualifier<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>   * @param value value to append to 
specified column<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   * @return this<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  public Append addColumn(byte[] family, 
byte[] qualifier, byte[] value) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    KeyValue kv = new KeyValue(this.row, 
family, qualifier, this.ts, KeyValue.Type.Put, value);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return add(kv);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * Add column and value to this Append 
operation.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @param cell<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @return This instance<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>   */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  @SuppressWarnings("unchecked")<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>  public Append add(final Cell cell) {<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    // Presume it is KeyValue for now.<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    byte [] family = 
CellUtil.cloneFamily(cell);<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>    // Get cell list for the family<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    // find where the new entry should be 
placed in the List<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    list.add(cell);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    return this;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  public Append setTimestamp(long 
timestamp) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    super.setTimestamp(timestamp);<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>    return this;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  public Append setAttribute(String name, 
byte[] value) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    return (Append) 
super.setAttribute(name, value);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span>  public Append setId(String id) {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    return (Append) super.setId(id);<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>  @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  public Append setDurability(Durability 
d) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    return (Append) 
super.setDurability(d);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  @Override<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  public Append 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    return (Append) 
super.setFamilyCellMap(map);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>  @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  public Append 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    return (Append) 
super.setClusterIds(clusterIds);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span>  @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  public Append 
setCellVisibility(CellVisibility expression) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    return (Append) 
super.setCellVisibility(expression);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  @Override<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  public Append setACL(String user, 
Permission perms) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    return (Append) super.setACL(user, 
perms);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>  @Override<a name="line.223"></a>
-<span class="sourceLineNo">224</span>  public Append setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    return (Append) 
super.setACL(perms);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>  @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  public Append setPriority(int priority) 
{<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    return (Append) 
super.setPriority(priority);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  @Override<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  public Append setTTL(long ttl) {<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>    return (Append) super.setTTL(ttl);<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>}<a name="line.237"></a>
+<span class="sourceLineNo">089</span>  @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public Append setReturnResults(boolean 
returnResults) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    
super.setReturnResults(returnResults);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    return this;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * @return current setting for 
returnResults<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  // This method makes public the 
superclasses's protected method.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  @Override<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public boolean isReturnResults() {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    return super.isReturnResults();<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<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>   * Create a Append operation for the 
specified row.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * &lt;p&gt;<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   * At least one column must be appended 
to.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @param row row key; makes a local 
copy of passed in array.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public Append(byte[] row) {<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    this(row, 0, row.length);<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>   * Copy constructor<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param a<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public Append(Append a) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    this.row = a.getRow();<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    this.ts = a.getTimeStamp();<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    this.tr = a.getTimeRange();<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    
this.familyMap.putAll(a.getFamilyCellMap());<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    for (Map.Entry&lt;String, byte[]&gt; 
entry : a.getAttributesMap().entrySet()) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      this.setAttribute(entry.getKey(), 
entry.getValue());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    this.setPriority(a.getPriority());<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  /** Create a Append operation for the 
specified row.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * &lt;p&gt;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * At least one column must be appended 
to.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @param rowArray Makes a copy out of 
this buffer.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @param rowOffset<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @param rowLength<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>   */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  public Append(final byte [] rowArray, 
final int rowOffset, final int rowLength) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    checkRow(rowArray, rowOffset, 
rowLength);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    this.row = Bytes.copy(rowArray, 
rowOffset, rowLength);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  /**<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   * Add the specified column and value 
to this Append operation.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   * @param family family name<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>   * @param qualifier column qualifier<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @param value value to append to 
specified column<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   * @return this<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @deprecated As of release 2.0.0, 
this will be removed in HBase 3.0.0.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   *             Use {@link 
#addColumn(byte[], byte[], byte[])} instead<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  @Deprecated<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  public Append add(byte [] family, byte 
[] qualifier, byte [] value) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    return this.addColumn(family, 
qualifier, value);<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>  /**<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Add the specified column and value 
to this Append operation.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * @param family family name<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>   * @param qualifier column qualifier<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>   * @param value value to append to 
specified column<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   * @return this<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  public Append addColumn(byte[] family, 
byte[] qualifier, byte[] value) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    KeyValue kv = new KeyValue(this.row, 
family, qualifier, this.ts, KeyValue.Type.Put, value);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    return add(kv);<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>  /**<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   * Add column and value to this Append 
operation.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   * @param cell<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * @return This instance<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>   */<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  @SuppressWarnings("unchecked")<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>  public Append add(final Cell cell) {<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    // Presume it is KeyValue for now.<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>    byte [] family = 
CellUtil.cloneFamily(cell);<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>    // Get cell list for the family<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // find where the new entry should be 
placed in the List<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    list.add(cell);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    return this;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  @Override<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public Append setTimestamp(long 
timestamp) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    super.setTimestamp(timestamp);<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>    return this;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>  }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>  @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  public Append setAttribute(String name, 
byte[] value) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    return (Append) 
super.setAttribute(name, value);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  public Append setId(String id) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    return (Append) super.setId(id);<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  @Override<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  public Append setDurability(Durability 
d) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    return (Append) 
super.setDurability(d);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>  }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Override<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public Append 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    return (Append) 
super.setFamilyCellMap(map);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  @Override<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  public Append 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    return (Append) 
super.setClusterIds(clusterIds);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  @Override<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  public Append 
setCellVisibility(CellVisibility expression) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    return (Append) 
super.setCellVisibility(expression);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public Append setACL(String user, 
Permission perms) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    return (Append) super.setACL(user, 
perms);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  @Override<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  public Append setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    return (Append) 
super.setACL(perms);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public Append setPriority(int priority) 
{<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    return (Append) 
super.setPriority(priority);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>  @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public Append setTTL(long ttl) {<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>    return (Append) super.setTTL(ttl);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorParams.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorParams.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorParams.html
index 9b25e8b..2dd8732 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorParams.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorParams.html
@@ -159,16 +159,17 @@
 <span class="sourceLineNo">151</span>   */<a name="line.151"></a>
 <span class="sourceLineNo">152</span>  
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="CN_IDIOM_NO_SUPER_CALL",<a
 name="line.152"></a>
 <span class="sourceLineNo">153</span>    justification="The clone below is 
complete")<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  public BufferedMutatorParams clone() 
{<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    BufferedMutatorParams clone = new 
BufferedMutatorParams(this.tableName);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    clone.writeBufferSize = 
this.writeBufferSize;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    clone.maxKeyValueSize = 
maxKeyValueSize;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    clone.pool = this.pool;<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>    clone.listener = this.listener;<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    clone.implementationClassName = 
this.implementationClassName;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return clone;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>}<a name="line.163"></a>
+<span class="sourceLineNo">154</span>  @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  public BufferedMutatorParams clone() 
{<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    BufferedMutatorParams clone = new 
BufferedMutatorParams(this.tableName);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    clone.writeBufferSize = 
this.writeBufferSize;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    clone.maxKeyValueSize = 
maxKeyValueSize;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    clone.pool = this.pool;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    clone.listener = this.listener;<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    clone.implementationClassName = 
this.implementationClassName;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    return clone;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>}<a name="line.164"></a>
 
 
 

Reply via email to