http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ce958bce/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 fcef767..f54b50e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/ServerName.html
@@ -34,346 +34,378 @@
<span class="sourceLineNo">026</span><a name="line.26"></a>
<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.classification.InterfaceStability;<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">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import
com.google.common.net.HostAndPort;<a name="line.32"></a>
+<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.net.Address;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.util.Addressing;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
<span class="sourceLineNo">033</span>import
com.google.common.net.InetAddresses;<a name="line.33"></a>
<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * Instance of an HBase ServerName.<a
name="line.36"></a>
-<span class="sourceLineNo">037</span> * A server name is used uniquely
identifying a server instance in a cluster and is made<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * of the combination of hostname, port,
and startcode. The startcode distingushes restarted<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * servers on same hostname and port
(startcode is usually timestamp of server startup). The<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * {@link #toString()} format of
ServerName is safe to use in the filesystem and as znode name<a
name="line.40"></a>
-<span class="sourceLineNo">041</span> * up in ZooKeeper. Its format is:<a
name="line.41"></a>
-<span class="sourceLineNo">042</span> * <code>&lt;hostname&gt;
'{@link #SERVERNAME_SEPARATOR}' &lt;port&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * '{@link #SERVERNAME_SEPARATOR}'
&lt;startcode&gt;</code>.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * For example, if hostname is
<code>www.example.org</code>, port is
<code>1234</code>,<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * and the startcode for the regionserver
is <code>1212121212</code>, then<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * the {@link #toString()} would be
<code>www.example.org,1234,1212121212</code>.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <p>You can obtain a versioned
serialized form of this class by calling<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * {@link #getVersionedBytes()}. To
deserialize, call {@link #parseVersionedServerName(byte[])}<a
name="line.49"></a>
-<span class="sourceLineNo">050</span> * <a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <p>Immutable.<a
name="line.51"></a>
-<span class="sourceLineNo">052</span> */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>@InterfaceAudience.Public<a
name="line.53"></a>
-<span class="sourceLineNo">054</span>@InterfaceStability.Evolving<a
name="line.54"></a>
-<span class="sourceLineNo">055</span> public class ServerName implements
Comparable<ServerName>, Serializable {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> private static final long
serialVersionUID = 1367463982557264981L;<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> * Version for this class.<a
name="line.59"></a>
-<span class="sourceLineNo">060</span> * Its a short rather than a byte so I
can for sure distinguish between this<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * version of this class and the
version previous to this which did not have<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * a version.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> */<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private static final short VERSION =
0;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> static final byte [] VERSION_BYTES =
Bytes.toBytes(VERSION);<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> /**<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * What to use if no startcode
supplied.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public static final int NON_STARTCODE =
-1;<a name="line.70"></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> * Name of a particular incarnation of an
HBase Server.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * A {@link ServerName} is used uniquely
identifying a server instance in a cluster and is made<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * of the combination of hostname, port,
and startcode. The startcode distinguishes restarted<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * servers on same hostname and port
(startcode is usually timestamp of server startup). The<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * {@link #toString()} format of
ServerName is safe to use in the filesystem and as znode name<a
name="line.41"></a>
+<span class="sourceLineNo">042</span> * up in ZooKeeper. Its format is:<a
name="line.42"></a>
+<span class="sourceLineNo">043</span> * <code>&lt;hostname&gt;
'{@link #SERVERNAME_SEPARATOR}' &lt;port&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * '{@link #SERVERNAME_SEPARATOR}'
&lt;startcode&gt;</code>.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * For example, if hostname is
<code>www.example.org</code>, port is
<code>1234</code>,<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * and the startcode for the regionserver
is <code>1212121212</code>, then<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * the {@link #toString()} would be
<code>www.example.org,1234,1212121212</code>.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p>You can obtain a versioned
serialized form of this class by calling<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * {@link #getVersionedBytes()}. To
deserialize, call<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * {@link
#parseVersionedServerName(byte[])}.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> *<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <p>Use {@link #getAddress()} to
obtain the Server hostname + port<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * (Endpoint/Socket Address).<a
name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <p>Immutable.<a
name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>@InterfaceAudience.Public<a
name="line.58"></a>
+<span class="sourceLineNo">059</span>@InterfaceStability.Evolving<a
name="line.59"></a>
+<span class="sourceLineNo">060</span>public class ServerName implements
Comparable<ServerName>, Serializable {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private static final long
serialVersionUID = 1367463982557264981L;<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> * Version for this class.<a
name="line.64"></a>
+<span class="sourceLineNo">065</span> * Its a short rather than a byte so I
can for sure distinguish between this<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * version of this class and the
version previous to this which did not have<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * a version.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private static final short VERSION =
0;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> static final byte [] VERSION_BYTES =
Bytes.toBytes(VERSION);<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>
-<span class="sourceLineNo">073</span> * This character is used as separator
between server hostname, port and<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * startcode.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span> public static final String
SERVERNAME_SEPARATOR = ",";<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> public static final Pattern
SERVERNAME_PATTERN =<a name="line.78"></a>
-<span class="sourceLineNo">079</span> Pattern.compile("[^" +
SERVERNAME_SEPARATOR + "]+" +<a name="line.79"></a>
-<span class="sourceLineNo">080</span> SERVERNAME_SEPARATOR +
Addressing.VALID_PORT_REGEX +<a name="line.80"></a>
-<span class="sourceLineNo">081</span> SERVERNAME_SEPARATOR +
Addressing.VALID_PORT_REGEX + "$");<a name="line.81"></a>
+<span class="sourceLineNo">073</span> * What to use if no startcode
supplied.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> */<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static final int NON_STARTCODE =
-1;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> /**<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * This character is used as separator
between server hostname, port and<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * startcode.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> */<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public static final String
SERVERNAME_SEPARATOR = ",";<a name="line.81"></a>
<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * What to use if server name is
unknown.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public static final String
UNKNOWN_SERVERNAME = "#unknown#";<a name="line.86"></a>
+<span class="sourceLineNo">083</span> public static final Pattern
SERVERNAME_PATTERN =<a name="line.83"></a>
+<span class="sourceLineNo">084</span> Pattern.compile("[^" +
SERVERNAME_SEPARATOR + "]+" +<a name="line.84"></a>
+<span class="sourceLineNo">085</span> SERVERNAME_SEPARATOR +
Addressing.VALID_PORT_REGEX +<a name="line.85"></a>
+<span class="sourceLineNo">086</span> SERVERNAME_SEPARATOR +
Addressing.VALID_PORT_REGEX + "$");<a name="line.86"></a>
<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> private final String servername;<a
name="line.88"></a>
-<span class="sourceLineNo">089</span> private final String hostnameOnly;<a
name="line.89"></a>
-<span class="sourceLineNo">090</span> private final int port;<a
name="line.90"></a>
-<span class="sourceLineNo">091</span> private final long startcode;<a
name="line.91"></a>
-<span class="sourceLineNo">092</span> private transient HostAndPort
hostAndPort;<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> * Cached versioned bytes of this
ServerName instance.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @see #getVersionedBytes()<a
name="line.96"></a>
-<span class="sourceLineNo">097</span> */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> private byte [] bytes;<a
name="line.98"></a>
-<span class="sourceLineNo">099</span> public static final
List<ServerName> EMPTY_SERVER_LIST = new
ArrayList<ServerName>(0);<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> protected ServerName(final String
hostname, final int port, final long startcode) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> // Drop the domain is there is one;
no need of it in a local cluster. With it, we get long<a name="line.102"></a>
-<span class="sourceLineNo">103</span> // unwieldy names.<a
name="line.103"></a>
-<span class="sourceLineNo">104</span> this.hostnameOnly = hostname;<a
name="line.104"></a>
-<span class="sourceLineNo">105</span> this.port = port;<a
name="line.105"></a>
-<span class="sourceLineNo">106</span> this.startcode = startcode;<a
name="line.106"></a>
-<span class="sourceLineNo">107</span> this.servername =
getServerName(hostname, port, startcode);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @param hostname<a
name="line.111"></a>
-<span class="sourceLineNo">112</span> * @return hostname minus the domain,
if there is one (will do pass-through on ip addresses)<a name="line.112"></a>
-<span class="sourceLineNo">113</span> */<a name="line.113"></a>
-<span class="sourceLineNo">114</span> static String
getHostNameMinusDomain(final String hostname) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> if
(InetAddresses.isInetAddress(hostname)) return hostname;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> String [] parts =
hostname.split("\\.");<a name="line.116"></a>
-<span class="sourceLineNo">117</span> if (parts == null || parts.length ==
0) return hostname;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> return parts[0];<a
name="line.118"></a>
+<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * What to use if server name is
unknown.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> */<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public static final String
UNKNOWN_SERVERNAME = "#unknown#";<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> private final String servername;<a
name="line.93"></a>
+<span class="sourceLineNo">094</span> private final long startcode;<a
name="line.94"></a>
+<span class="sourceLineNo">095</span> private transient Address address;<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> * Cached versioned bytes of this
ServerName instance.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @see #getVersionedBytes()<a
name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private byte [] bytes;<a
name="line.101"></a>
+<span class="sourceLineNo">102</span> public static final
List<ServerName> EMPTY_SERVER_LIST = new
ArrayList<ServerName>(0);<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> protected ServerName(final String
hostname, final int port, final long startcode) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> this(Address.fromParts(hostname,
port), startcode);<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> private ServerName(final Address
address, final long startcode) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // Use HostAndPort to host port and
hostname. Does validation and can do ipv6<a name="line.109"></a>
+<span class="sourceLineNo">110</span> this.address = address;<a
name="line.110"></a>
+<span class="sourceLineNo">111</span> this.startcode = startcode;<a
name="line.111"></a>
+<span class="sourceLineNo">112</span> this.servername =
getServerName(this.address.getHostname(),<a name="line.112"></a>
+<span class="sourceLineNo">113</span> this.address.getPort(),
startcode);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> private ServerName(final String
serverName) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> this(parseHostname(serverName),
parsePort(serverName),<a name="line.117"></a>
+<span class="sourceLineNo">118</span> parseStartcode(serverName));<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> private ServerName(final String
serverName) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> this(parseHostname(serverName),
parsePort(serverName),<a name="line.122"></a>
-<span class="sourceLineNo">123</span> parseStartcode(serverName));<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> private ServerName(final String
hostAndPort, final long startCode) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>
this(Addressing.parseHostname(hostAndPort),<a name="line.127"></a>
-<span class="sourceLineNo">128</span> Addressing.parsePort(hostAndPort),
startCode);<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> public static String
parseHostname(final String serverName) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> if (serverName == null ||
serverName.length() <= 0) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> throw new
IllegalArgumentException("Passed hostname is null or empty");<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if
(!Character.isLetterOrDigit(serverName.charAt(0))) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> throw new
IllegalArgumentException("Bad passed hostname, serverName=" + serverName);<a
name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> int index =
serverName.indexOf(SERVERNAME_SEPARATOR);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> return serverName.substring(0,
index);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static int parsePort(final
String serverName) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> String [] split =
serverName.split(SERVERNAME_SEPARATOR);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return Integer.parseInt(split[1]);<a
name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> public static long parseStartcode(final
String serverName) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> int index =
serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return
Long.parseLong(serverName.substring(index + 1));<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> * Retrieve an instance of
ServerName.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * a shared immutable object as an
internal optimization.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public static ServerName valueOf(final
String hostname, final int port, final long startcode) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> return new ServerName(hostname, port,
startcode);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * Retrieve an instance of
ServerName.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * a shared immutable object as an
internal optimization.<a name="line.164"></a>
-<span class="sourceLineNo">165</span> */<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public static ServerName valueOf(final
String serverName) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return new ServerName(serverName);<a
name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Retrieve an instance of
ServerName.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * a shared immutable object as an
internal optimization.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public static ServerName valueOf(final
String hostAndPort, final long startCode) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return new ServerName(hostAndPort,
startCode);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> @Override<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public String toString() {<a
name="line.180"></a>
-<span class="sourceLineNo">181</span> return getServerName();<a
name="line.181"></a>
+<span class="sourceLineNo">121</span> private ServerName(final String
hostAndPort, final long startCode) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> this(Address.fromString(hostAndPort),
startCode);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<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> * @param hostname<a
name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return hostname minus the domain,
if there is one (will do pass-through on ip addresses)<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @deprecated Since 2.0. This is for
internal use only.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Deprecated<a name="line.130"></a>
+<span class="sourceLineNo">131</span> // Make this private in hbase-3.0.<a
name="line.131"></a>
+<span class="sourceLineNo">132</span> static String
getHostNameMinusDomain(final String hostname) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if
(InetAddresses.isInetAddress(hostname)) return hostname;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> String [] parts =
hostname.split("\\.");<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (parts == null || parts.length ==
0) return hostname;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return parts[0];<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> /**<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @deprecated Since 2.0. Use {@link
#valueOf(String)}<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> @Deprecated<a name="line.142"></a>
+<span class="sourceLineNo">143</span> // This is unused. Get rid of it.<a
name="line.143"></a>
+<span class="sourceLineNo">144</span> public static String
parseHostname(final String serverName) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> if (serverName == null ||
serverName.length() <= 0) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> throw new
IllegalArgumentException("Passed hostname is null or empty");<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span> if
(!Character.isLetterOrDigit(serverName.charAt(0))) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> throw new
IllegalArgumentException("Bad passed hostname, serverName=" + serverName);<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> int index =
serverName.indexOf(SERVERNAME_SEPARATOR);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> return serverName.substring(0,
index);<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> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @deprecated Since 2.0. Use {@link
#valueOf(String)}<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> @Deprecated<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // This is unused. Get rid of it.<a
name="line.159"></a>
+<span class="sourceLineNo">160</span> public static int parsePort(final
String serverName) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> String [] split =
serverName.split(SERVERNAME_SEPARATOR);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return Integer.parseInt(split[1]);<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> /**<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @deprecated Since 2.0. Use {@link
#valueOf(String)}<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> @Deprecated<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // This is unused. Get rid of it.<a
name="line.169"></a>
+<span class="sourceLineNo">170</span> public static long parseStartcode(final
String serverName) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> int index =
serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return
Long.parseLong(serverName.substring(index + 1));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * Retrieve an instance of
ServerName.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * a shared immutable object as an
internal optimization.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> */<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public static ServerName valueOf(final
String hostname, final int port, final long startcode) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return new ServerName(hostname, port,
startcode);<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> /**<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * @return Return a SHORT version of
{@link ServerName#toString()}, one that has the host only,<a
name="line.185"></a>
-<span class="sourceLineNo">186</span> * minus the domain, and the port only
-- no start code; the String is for us internally mostly<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * tying threads to their server. Not
for external use. It is lossy and will not work in<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * in compares, etc.<a
name="line.188"></a>
-<span class="sourceLineNo">189</span> */<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public String toShortString() {<a
name="line.190"></a>
-<span class="sourceLineNo">191</span> return
Addressing.createHostAndPortStr(<a name="line.191"></a>
-<span class="sourceLineNo">192</span>
getHostNameMinusDomain(hostnameOnly), port);<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> /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @return {@link #getServerName()} as
bytes with a short-sized prefix with<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * the ServerName#VERSION of this
class.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> */<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public synchronized byte []
getVersionedBytes() {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (this.bytes == null) {<a
name="line.200"></a>
-<span class="sourceLineNo">201</span> this.bytes =
Bytes.add(VERSION_BYTES, Bytes.toBytes(getServerName()));<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return this.bytes;<a
name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span> public String getServerName() {<a
name="line.206"></a>
-<span class="sourceLineNo">207</span> return servername;<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> public String getHostname() {<a
name="line.210"></a>
-<span class="sourceLineNo">211</span> return hostnameOnly;<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> public int getPort() {<a
name="line.214"></a>
-<span class="sourceLineNo">215</span> return port;<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> public long getStartcode() {<a
name="line.218"></a>
-<span class="sourceLineNo">219</span> return startcode;<a
name="line.219"></a>
-<span class="sourceLineNo">220</span> }<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> * For internal use only.<a
name="line.223"></a>
-<span class="sourceLineNo">224</span> * @param hostName<a
name="line.224"></a>
-<span class="sourceLineNo">225</span> * @param port<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * @param startcode<a
name="line.226"></a>
-<span class="sourceLineNo">227</span> * @return Server name made of the
concatenation of hostname, port and<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * startcode formatted as
<code>&lt;hostname&gt; ',' &lt;port&gt; ','
&lt;startcode&gt;</code><a name="line.228"></a>
-<span class="sourceLineNo">229</span> */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> static String getServerName(String
hostName, int port, long startcode) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> final StringBuilder name = new
StringBuilder(hostName.length() + 1 + 5 + 1 + 13);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>
name.append(hostName.toLowerCase(Locale.ROOT));<a name="line.232"></a>
-<span class="sourceLineNo">233</span> name.append(SERVERNAME_SEPARATOR);<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> name.append(port);<a
name="line.234"></a>
-<span class="sourceLineNo">235</span> name.append(SERVERNAME_SEPARATOR);<a
name="line.235"></a>
-<span class="sourceLineNo">236</span> name.append(startcode);<a
name="line.236"></a>
-<span class="sourceLineNo">237</span> return name.toString();<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> /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @param hostAndPort String in form of
&lt;hostname&gt; ':' &lt;port&gt;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @param startcode<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> * @return Server name made of the
concatenation of hostname, port and<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * startcode formatted as
<code>&lt;hostname&gt; ',' &lt;port&gt; ','
&lt;startcode&gt;</code><a name="line.244"></a>
-<span class="sourceLineNo">245</span> */<a name="line.245"></a>
-<span class="sourceLineNo">246</span> public static String
getServerName(final String hostAndPort,<a name="line.246"></a>
-<span class="sourceLineNo">247</span> final long startcode) {<a
name="line.247"></a>
-<span class="sourceLineNo">248</span> int index =
hostAndPort.indexOf(":");<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (index <= 0) throw new
IllegalArgumentException("Expected <hostname> ':' <port>");<a
name="line.249"></a>
-<span class="sourceLineNo">250</span> return
getServerName(hostAndPort.substring(0, index),<a name="line.250"></a>
-<span class="sourceLineNo">251</span>
Integer.parseInt(hostAndPort.substring(index + 1)), startcode);<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> * @return Hostname and port formatted
as described at<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * {@link
Addressing#createHostAndPortStr(String, int)}<a name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> public String getHostAndPort() {<a
name="line.258"></a>
-<span class="sourceLineNo">259</span> return
Addressing.createHostAndPortStr(hostnameOnly, port);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> public HostAndPort getHostPort() {<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> if (hostAndPort == null) {<a
name="line.263"></a>
-<span class="sourceLineNo">264</span> hostAndPort =
HostAndPort.fromParts(hostnameOnly, port);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return hostAndPort;<a
name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
-<span class="sourceLineNo">270</span> * @param serverName ServerName in form
specified by {@link #getServerName()}<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @return The server start code parsed
from <code>servername</code><a name="line.271"></a>
-<span class="sourceLineNo">272</span> */<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public static long
getServerStartcodeFromServerName(final String serverName) {<a
name="line.273"></a>
-<span class="sourceLineNo">274</span> int index =
serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return
Long.parseLong(serverName.substring(index + 1));<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> * Utility method to excise the start
code from a server name<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * @param inServerName full server
name<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * @return server name less its start
code<a name="line.281"></a>
-<span class="sourceLineNo">282</span> */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public static String
getServerNameLessStartCode(String inServerName) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (inServerName != null &&
inServerName.length() > 0) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> int index =
inServerName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> if (index > 0) {<a
name="line.286"></a>
-<span class="sourceLineNo">287</span> return inServerName.substring(0,
index);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return inServerName;<a
name="line.290"></a>
+<span class="sourceLineNo">185</span> * Retrieve an instance of
ServerName.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * a shared immutable object as an
internal optimization.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> */<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public static ServerName valueOf(final
String serverName) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return new ServerName(serverName);<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> /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * Retrieve an instance of
ServerName.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * Callers should use the equals method
to compare returned instances, though we may return<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * a shared immutable object as an
internal optimization.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public static ServerName valueOf(final
String hostAndPort, final long startCode) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return new ServerName(hostAndPort,
startCode);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span> public String toString() {<a
name="line.203"></a>
+<span class="sourceLineNo">204</span> return getServerName();<a
name="line.204"></a>
+<span class="sourceLineNo">205</span> }<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> * @return Return a SHORT version of
{@link ServerName#toString()}, one that has the host only,<a
name="line.208"></a>
+<span class="sourceLineNo">209</span> * minus the domain, and the port only
-- no start code; the String is for us internally mostly<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * tying threads to their server. Not
for external use. It is lossy and will not work in<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * in compares, etc.<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public String toShortString() {<a
name="line.213"></a>
+<span class="sourceLineNo">214</span> return
Addressing.createHostAndPortStr(<a name="line.214"></a>
+<span class="sourceLineNo">215</span>
getHostNameMinusDomain(this.address.getHostname()),<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.address.getPort());<a
name="line.216"></a>
+<span class="sourceLineNo">217</span> }<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> * @return {@link #getServerName()} as
bytes with a short-sized prefix with<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * the ServerName#VERSION of this
class.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> */<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public synchronized byte []
getVersionedBytes() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (this.bytes == null) {<a
name="line.224"></a>
+<span class="sourceLineNo">225</span> this.bytes =
Bytes.add(VERSION_BYTES, Bytes.toBytes(getServerName()));<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return this.bytes;<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> public String getServerName() {<a
name="line.230"></a>
+<span class="sourceLineNo">231</span> return servername;<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> public String getHostname() {<a
name="line.234"></a>
+<span class="sourceLineNo">235</span> return this.address.getHostname();<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">238</span> public int getPort() {<a
name="line.238"></a>
+<span class="sourceLineNo">239</span> return this.address.getPort();<a
name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public long getStartcode() {<a
name="line.242"></a>
+<span class="sourceLineNo">243</span> return startcode;<a
name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * For internal use only.<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> * @param hostName<a
name="line.248"></a>
+<span class="sourceLineNo">249</span> * @param port<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * @param startcode<a
name="line.250"></a>
+<span class="sourceLineNo">251</span> * @return Server name made of the
concatenation of hostname, port and<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * startcode formatted as
<code>&lt;hostname&gt; ',' &lt;port&gt; ','
&lt;startcode&gt;</code><a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @deprecated Since 2.0. Use {@link
ServerName#valueOf(String, int, long)} instead.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> */<a name="line.254"></a>
+<span class="sourceLineNo">255</span> @Deprecated<a name="line.255"></a>
+<span class="sourceLineNo">256</span> // TODO: Make this private in
hbase-3.0.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> static String getServerName(String
hostName, int port, long startcode) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> final StringBuilder name = new
StringBuilder(hostName.length() + 1 + 5 + 1 + 13);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>
name.append(hostName.toLowerCase(Locale.ROOT));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> name.append(SERVERNAME_SEPARATOR);<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> name.append(port);<a
name="line.261"></a>
+<span class="sourceLineNo">262</span> name.append(SERVERNAME_SEPARATOR);<a
name="line.262"></a>
+<span class="sourceLineNo">263</span> name.append(startcode);<a
name="line.263"></a>
+<span class="sourceLineNo">264</span> return name.toString();<a
name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * @param hostAndPort String in form of
&lt;hostname&gt; ':' &lt;port&gt;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * @param startcode<a
name="line.269"></a>
+<span class="sourceLineNo">270</span> * @return Server name made of the
concatenation of hostname, port and<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * startcode formatted as
<code>&lt;hostname&gt; ',' &lt;port&gt; ','
&lt;startcode&gt;</code><a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @deprecated Since 2.0. Use {@link
ServerName#valueOf(String, long)} instead.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> */<a name="line.273"></a>
+<span class="sourceLineNo">274</span> @Deprecated<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public static String
getServerName(final String hostAndPort,<a name="line.275"></a>
+<span class="sourceLineNo">276</span> final long startcode) {<a
name="line.276"></a>
+<span class="sourceLineNo">277</span> int index =
hostAndPort.indexOf(":");<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (index <= 0) throw new
IllegalArgumentException("Expected <hostname> ':' <port>");<a
name="line.278"></a>
+<span class="sourceLineNo">279</span> return
getServerName(hostAndPort.substring(0, index),<a name="line.279"></a>
+<span class="sourceLineNo">280</span>
Integer.parseInt(hostAndPort.substring(index + 1)), startcode);<a
name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> /**<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @return Hostname and port formatted
as described at<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * {@link
Addressing#createHostAndPortStr(String, int)}<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @deprecated Since 2.0. Use {@link
#getAddress()} instead.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> @Deprecated<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public String getHostAndPort() {<a
name="line.289"></a>
+<span class="sourceLineNo">290</span> return this.address.toString();<a
name="line.290"></a>
<span class="sourceLineNo">291</span> }<a name="line.291"></a>
<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span> public int compareTo(ServerName other)
{<a name="line.294"></a>
-<span class="sourceLineNo">295</span> int compare =
this.getHostname().compareToIgnoreCase(other.getHostname());<a
name="line.295"></a>
-<span class="sourceLineNo">296</span> if (compare != 0) return compare;<a
name="line.296"></a>
-<span class="sourceLineNo">297</span> compare = this.getPort() -
other.getPort();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (compare != 0) return compare;<a
name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> return
Long.compare(this.getStartcode(), other.getStartcode());<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> @Override<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public int hashCode() {<a
name="line.304"></a>
-<span class="sourceLineNo">305</span> return getServerName().hashCode();<a
name="line.305"></a>
+<span class="sourceLineNo">293</span> public Address getAddress() {<a
name="line.293"></a>
+<span class="sourceLineNo">294</span> return this.address;<a
name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> /**<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * @param serverName ServerName in form
specified by {@link #getServerName()}<a name="line.298"></a>
+<span class="sourceLineNo">299</span> * @return The server start code parsed
from <code>servername</code><a name="line.299"></a>
+<span class="sourceLineNo">300</span> * @deprecated Since 2.0. Use instance
of ServerName to pull out start code.<a name="line.300"></a>
+<span class="sourceLineNo">301</span> */<a name="line.301"></a>
+<span class="sourceLineNo">302</span> @Deprecated<a name="line.302"></a>
+<span class="sourceLineNo">303</span> public static long
getServerStartcodeFromServerName(final String serverName) {<a
name="line.303"></a>
+<span class="sourceLineNo">304</span> int index =
serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return
Long.parseLong(serverName.substring(index + 1));<a name="line.305"></a>
<span class="sourceLineNo">306</span> }<a name="line.306"></a>
<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public boolean equals(Object o) {<a
name="line.309"></a>
-<span class="sourceLineNo">310</span> if (this == o) return true;<a
name="line.310"></a>
-<span class="sourceLineNo">311</span> if (o == null) return false;<a
name="line.311"></a>
-<span class="sourceLineNo">312</span> if (!(o instanceof ServerName))
return false;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return this.compareTo((ServerName)o)
== 0;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @param left<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * @param right<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * @return True if
<code>other</code> has same hostname and port.<a
name="line.319"></a>
-<span class="sourceLineNo">320</span> */<a name="line.320"></a>
-<span class="sourceLineNo">321</span> public static boolean
isSameHostnameAndPort(final ServerName left,<a name="line.321"></a>
-<span class="sourceLineNo">322</span> final ServerName right) {<a
name="line.322"></a>
-<span class="sourceLineNo">323</span> if (left == null) return false;<a
name="line.323"></a>
-<span class="sourceLineNo">324</span> if (right == null) return false;<a
name="line.324"></a>
-<span class="sourceLineNo">325</span> return
left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &&<a
name="line.325"></a>
-<span class="sourceLineNo">326</span> left.getPort() ==
right.getPort();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * Use this method instantiating a
{@link ServerName} from bytes<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * gotten from a call to {@link
#getVersionedBytes()}. Will take care of the<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * case where bytes were written by an
earlier version of hbase.<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * @param versionedBytes Pass bytes
gotten from a call to {@link #getVersionedBytes()}<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * @return A ServerName instance.<a
name="line.334"></a>
-<span class="sourceLineNo">335</span> * @see #getVersionedBytes()<a
name="line.335"></a>
-<span class="sourceLineNo">336</span> */<a name="line.336"></a>
-<span class="sourceLineNo">337</span> public static ServerName
parseVersionedServerName(final byte [] versionedBytes) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> // Version is a short.<a
name="line.338"></a>
-<span class="sourceLineNo">339</span> short version =
Bytes.toShort(versionedBytes);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (version == VERSION) {<a
name="line.340"></a>
-<span class="sourceLineNo">341</span> int length = versionedBytes.length
- Bytes.SIZEOF_SHORT;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return
valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a
name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // Presume the bytes were written
with an old version of hbase and that the<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // bytes are actually a String of the
form "'<hostname>' ':' '<port>'".<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return
valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<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> /**<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @param str Either an instance of
{@link ServerName#toString()} or a<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * "'&lt;hostname&gt;' ':'
'&lt;port&gt;'".<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * @return A ServerName instance.<a
name="line.352"></a>
-<span class="sourceLineNo">353</span> */<a name="line.353"></a>
-<span class="sourceLineNo">354</span> public static ServerName
parseServerName(final String str) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> return
SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.355"></a>
-<span class="sourceLineNo">356</span> valueOf(str, NON_STARTCODE);<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> /**<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * @return true if the String follows
the pattern of {@link ServerName#toString()}, false<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * otherwise.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> */<a name="line.363"></a>
-<span class="sourceLineNo">364</span> public static boolean
isFullServerName(final String str){<a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (str == null ||str.isEmpty())
return false;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return
SERVERNAME_PATTERN.matcher(str).matches();<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>}<a name="line.368"></a>
+<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * Utility method to excise the start
code from a server name<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * @param inServerName full server
name<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @return server name less its start
code<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @deprecated Since 2.0. Use {@link
#getAddress()}<a name="line.312"></a>
+<span class="sourceLineNo">313</span> */<a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Deprecated<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public static String
getServerNameLessStartCode(String inServerName) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (inServerName != null &&
inServerName.length() > 0) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> int index =
inServerName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> if (index > 0) {<a
name="line.318"></a>
+<span class="sourceLineNo">319</span> return inServerName.substring(0,
index);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return inServerName;<a
name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> @Override<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public int compareTo(ServerName other)
{<a name="line.326"></a>
+<span class="sourceLineNo">327</span> int compare =
this.getHostname().compareToIgnoreCase(other.getHostname());<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> compare = this.getPort() -
other.getPort();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> if (compare != 0) return compare;<a
name="line.330"></a>
+<span class="sourceLineNo">331</span> return
Long.compare(this.getStartcode(), other.getStartcode());<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> @Override<a name="line.334"></a>
+<span class="sourceLineNo">335</span> public int hashCode() {<a
name="line.335"></a>
+<span class="sourceLineNo">336</span> return getServerName().hashCode();<a
name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> @Override<a name="line.339"></a>
+<span class="sourceLineNo">340</span> public boolean equals(Object o) {<a
name="line.340"></a>
+<span class="sourceLineNo">341</span> if (this == o) return true;<a
name="line.341"></a>
+<span class="sourceLineNo">342</span> if (o == null) return false;<a
name="line.342"></a>
+<span class="sourceLineNo">343</span> if (!(o instanceof ServerName))
return false;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> return this.compareTo((ServerName)o)
== 0;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<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> * @param left<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * @param right<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * @return True if
<code>other</code> has same hostname and port.<a
name="line.350"></a>
+<span class="sourceLineNo">351</span> */<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public static boolean
isSameHostnameAndPort(final ServerName left,<a name="line.352"></a>
+<span class="sourceLineNo">353</span> final ServerName right) {<a
name="line.353"></a>
+<span class="sourceLineNo">354</span> // TODO: Make this
left.getAddress().equals(right.getAddress())<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (left == null) return false;<a
name="line.355"></a>
+<span class="sourceLineNo">356</span> if (right == null) return false;<a
name="line.356"></a>
+<span class="sourceLineNo">357</span> return
left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &&<a
name="line.357"></a>
+<span class="sourceLineNo">358</span> left.getPort() ==
right.getPort();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<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> * Use this method instantiating a
{@link ServerName} from bytes<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * gotten from a call to {@link
#getVersionedBytes()}. Will take care of the<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * case where bytes were written by an
earlier version of hbase.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @param versionedBytes Pass bytes
gotten from a call to {@link #getVersionedBytes()}<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @return A ServerName instance.<a
name="line.366"></a>
+<span class="sourceLineNo">367</span> * @see #getVersionedBytes()<a
name="line.367"></a>
+<span class="sourceLineNo">368</span> */<a name="line.368"></a>
+<span class="sourceLineNo">369</span> public static ServerName
parseVersionedServerName(final byte [] versionedBytes) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> // Version is a short.<a
name="line.370"></a>
+<span class="sourceLineNo">371</span> short version =
Bytes.toShort(versionedBytes);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> if (version == VERSION) {<a
name="line.372"></a>
+<span class="sourceLineNo">373</span> int length = versionedBytes.length
- Bytes.SIZEOF_SHORT;<a name="line.373"></a>
+<span class="sourceLineNo">374</span> return
valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a
name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> // Presume the bytes were written
with an old version of hbase and that the<a name="line.376"></a>
+<span class="sourceLineNo">377</span> // bytes are actually a String of the
form "'<hostname>' ':' '<port>'".<a name="line.377"></a>
+<span class="sourceLineNo">378</span> return
valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<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> * @param str Either an instance of
{@link ServerName#toString()} or a<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * "'&lt;hostname&gt;' ':'
'&lt;port&gt;'".<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @return A ServerName instance.<a
name="line.384"></a>
+<span class="sourceLineNo">385</span> */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public static ServerName
parseServerName(final String str) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return
SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.387"></a>
+<span class="sourceLineNo">388</span> valueOf(str, NON_STARTCODE);<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><a name="line.391"></a>
+<span class="sourceLineNo">392</span> /**<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * @return true if the String follows
the pattern of {@link ServerName#toString()}, false<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * otherwise.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> */<a name="line.395"></a>
+<span class="sourceLineNo">396</span> public static boolean
isFullServerName(final String str){<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (str == null ||str.isEmpty())
return false;<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return
SERVERNAME_PATTERN.matcher(str).matches();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>}<a name="line.400"></a>