You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/07/22 09:31:17 UTC
[39/51] [partial] hbase-site git commit: Published site at
b4759ce6e72f50ccd9d410bd5917dc5a515414f1.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/df8fd1d3/devapidocs/src-html/org/apache/hadoop/hbase/ServerName.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ServerName.html b/devapidocs/src-html/org/apache/hadoop/hbase/ServerName.html
index f9b4f3e..88e84b4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ServerName.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ServerName.html
@@ -35,156 +35,156 @@
<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">030</span>import org.apache.hbase.thirdparty.com.google.common.collect.Interner;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hbase.thirdparty.com.google.common.collect.Interners;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import org.apache.hbase.thirdparty.com.google.common.net.InetAddresses;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<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> * Name of a particular incarnation of an HBase Server.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * A {@link ServerName} 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 distinguishes 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<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * {@link #parseVersionedServerName(byte[])}.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> *<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <p>Use {@link #getAddress()} to obtain the Server hostname + port<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * (Endpoint/Socket Address).<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <p>Immutable.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>@InterfaceAudience.Public<a name="line.57"></a>
-<span class="sourceLineNo">058</span>public class ServerName implements Comparable<ServerName>, Serializable {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private static final long serialVersionUID = 1367463982557264981L;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Version for this class.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * Its a short rather than a byte so I can for sure distinguish between this<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * version of this class and the version previous to this which did not have<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * a version.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private static final short VERSION = 0;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> static final byte [] VERSION_BYTES = Bytes.toBytes(VERSION);<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * What to use if no startcode supplied.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public static final int NON_STARTCODE = -1;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * This character is used as separator between server hostname, port and<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * startcode.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> */<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public static final String SERVERNAME_SEPARATOR = ",";<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> public static final Pattern SERVERNAME_PATTERN =<a name="line.81"></a>
-<span class="sourceLineNo">082</span> Pattern.compile("[^" + SERVERNAME_SEPARATOR + "]+" +<a name="line.82"></a>
-<span class="sourceLineNo">083</span> SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX +<a name="line.83"></a>
-<span class="sourceLineNo">084</span> SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX + "$");<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * What to use if server name is unknown.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> */<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public static final String UNKNOWN_SERVERNAME = "#unknown#";<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> private final String servername;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private final long startcode;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> private transient Address address;<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> * Cached versioned bytes of this ServerName instance.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @see #getVersionedBytes()<a name="line.97"></a>
-<span class="sourceLineNo">098</span> */<a name="line.98"></a>
-<span class="sourceLineNo">099</span> private byte [] bytes;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public static final List<ServerName> EMPTY_SERVER_LIST = new ArrayList<>(0);<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> protected ServerName(final String hostname, final int port, final long startcode) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> this(Address.fromParts(hostname, port), startcode);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> private ServerName(final Address address, final long startcode) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> // Use HostAndPort to host port and hostname. Does validation and can do ipv6<a name="line.107"></a>
-<span class="sourceLineNo">108</span> this.address = address;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> this.startcode = startcode;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> this.servername = getServerName(this.address.getHostname(),<a name="line.110"></a>
-<span class="sourceLineNo">111</span> this.address.getPort(), startcode);<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> private ServerName(final String serverName) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> this(parseHostname(serverName), parsePort(serverName),<a name="line.115"></a>
-<span class="sourceLineNo">116</span> parseStartcode(serverName));<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private ServerName(final String hostAndPort, final long startCode) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> this(Address.fromString(hostAndPort), startCode);<a name="line.120"></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>/**<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Name of a particular incarnation of an HBase Server.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * A {@link ServerName} is used uniquely identifying a server instance in a cluster and is made<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * of the combination of hostname, port, and startcode. The startcode distinguishes restarted<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * servers on same hostname and port (startcode is usually timestamp of server startup). The<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * {@link #toString()} format of ServerName is safe to use in the filesystem and as znode name<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * up in ZooKeeper. Its format is:<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <code>&lt;hostname&gt; '{@link #SERVERNAME_SEPARATOR}' &lt;port&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * '{@link #SERVERNAME_SEPARATOR}' &lt;startcode&gt;</code>.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * For example, if hostname is <code>www.example.org</code>, port is <code>1234</code>,<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * and the startcode for the regionserver is <code>1212121212</code>, then<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * the {@link #toString()} would be <code>www.example.org,1234,1212121212</code>.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <p>You can obtain a versioned serialized form of this class by calling<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * {@link #getVersionedBytes()}. To deserialize, call<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * {@link #parseVersionedServerName(byte[])}.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <p>Use {@link #getAddress()} to obtain the Server hostname + port<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * (Endpoint/Socket Address).<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <p>Immutable.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>@InterfaceAudience.Public<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> * 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> 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> /**<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<>(0);<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> * Intern ServerNames. The Set of ServerNames is mostly-fixed changing slowly as Servers<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * restart. Rather than create a new instance everytime, try and return existing instance<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * if there is one.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> */<a name="line.108"></a>
+<span class="sourceLineNo">109</span> private static final Interner<ServerName> INTERN_POOL = Interners.newWeakInterner();<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> protected ServerName(final String hostname, final int port, final long startcode) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> this(Address.fromParts(hostname, port), startcode);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> private ServerName(final Address address, final long startcode) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // Use HostAndPort to host port and hostname. Does validation and can do ipv6<a name="line.116"></a>
+<span class="sourceLineNo">117</span> this.address = address;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> this.startcode = startcode;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> this.servername = getServerName(this.address.getHostname(),<a name="line.119"></a>
+<span class="sourceLineNo">120</span> this.address.getPort(), startcode);<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @param hostname<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @return hostname minus the domain, if there is one (will do pass-through on ip addresses)<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @deprecated Since 2.0. This is for internal use only.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Deprecated<a name="line.128"></a>
-<span class="sourceLineNo">129</span> // Make this private in hbase-3.0.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> static String getHostNameMinusDomain(final String hostname) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (InetAddresses.isInetAddress(hostname)) return hostname;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> String [] parts = hostname.split("\\.");<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (parts == null || parts.length == 0) return hostname;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> return parts[0];<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<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> * @deprecated Since 2.0. Use {@link #valueOf(String)}<a name="line.138"></a>
-<span class="sourceLineNo">139</span> */<a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Deprecated<a name="line.140"></a>
-<span class="sourceLineNo">141</span> // This is unused. Get rid of it.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static String parseHostname(final String serverName) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (serverName == null || serverName.length() <= 0) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> throw new IllegalArgumentException("Passed hostname is null or empty");<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (!Character.isLetterOrDigit(serverName.charAt(0))) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> throw new IllegalArgumentException("Bad passed hostname, serverName=" + serverName);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span> int index = serverName.indexOf(SERVERNAME_SEPARATOR);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return serverName.substring(0, index);<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> /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @deprecated Since 2.0. Use {@link #valueOf(String)}<a name="line.154"></a>
-<span class="sourceLineNo">155</span> */<a name="line.155"></a>
-<span class="sourceLineNo">156</span> @Deprecated<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // This is unused. Get rid of it.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public static int parsePort(final String serverName) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> String [] split = serverName.split(SERVERNAME_SEPARATOR);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return Integer.parseInt(split[1]);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<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> * @deprecated Since 2.0. Use {@link #valueOf(String)}<a name="line.164"></a>
-<span class="sourceLineNo">165</span> */<a name="line.165"></a>
-<span class="sourceLineNo">166</span> @Deprecated<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // This is unused. Get rid of it.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public static long parseStartcode(final String serverName) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> int index = serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> return Long.parseLong(serverName.substring(index + 1));<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Retrieve an instance of ServerName.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * Callers should use the equals method to compare returned instances, though we may return<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * a shared immutable object as an internal optimization.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> */<a name="line.177"></a>
-<span class="sourceLineNo">178</span> public static ServerName valueOf(final String hostname, final int port, final long startcode) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return new ServerName(hostname, port, startcode);<a name="line.179"></a>
+<span class="sourceLineNo">123</span> private ServerName(final String serverName) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> this(parseHostname(serverName), parsePort(serverName),<a name="line.124"></a>
+<span class="sourceLineNo">125</span> parseStartcode(serverName));<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> private ServerName(final String hostAndPort, final long startCode) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> this(Address.fromString(hostAndPort), startCode);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @param hostname<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @return hostname minus the domain, if there is one (will do pass-through on ip addresses)<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @deprecated Since 2.0. This is for internal use only.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> @Deprecated<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Make this private in hbase-3.0.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> static String getHostNameMinusDomain(final String hostname) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> if (InetAddresses.isInetAddress(hostname)) return hostname;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> String [] parts = hostname.split("\\.");<a name="line.141"></a>
+<span class="sourceLineNo">142</span> if (parts == null || parts.length == 0) return hostname;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return parts[0];<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<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> * @deprecated Since 2.0. Use {@link #valueOf(String)}<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> // This is unused. Get rid of it.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> public static String parseHostname(final String serverName) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> if (serverName == null || serverName.length() <= 0) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> throw new IllegalArgumentException("Passed hostname is null or empty");<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> if (!Character.isLetterOrDigit(serverName.charAt(0))) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> throw new IllegalArgumentException("Bad passed hostname, serverName=" + serverName);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> int index = serverName.indexOf(SERVERNAME_SEPARATOR);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> return serverName.substring(0, index);<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> /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @deprecated Since 2.0. Use {@link #valueOf(String)}<a name="line.163"></a>
+<span class="sourceLineNo">164</span> */<a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Deprecated<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // This is unused. Get rid of it.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public static int parsePort(final String serverName) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> String [] split = serverName.split(SERVERNAME_SEPARATOR);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return Integer.parseInt(split[1]);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @deprecated Since 2.0. Use {@link #valueOf(String)}<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> @Deprecated<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // This is unused. Get rid of it.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public static long parseStartcode(final String serverName) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> int index = serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return Long.parseLong(serverName.substring(index + 1));<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> /**<a name="line.182"></a>
@@ -192,8 +192,8 @@
<span class="sourceLineNo">184</span> * Callers should use the equals method to compare returned instances, though we may return<a name="line.184"></a>
<span class="sourceLineNo">185</span> * a shared immutable object as an internal optimization.<a name="line.185"></a>
<span class="sourceLineNo">186</span> */<a name="line.186"></a>
-<span class="sourceLineNo">187</span> public static ServerName valueOf(final String serverName) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return new ServerName(serverName);<a name="line.188"></a>
+<span class="sourceLineNo">187</span> public static ServerName valueOf(final String hostname, final int port, final long startcode) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return INTERN_POOL.intern(new ServerName(hostname, port, startcode));<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>
<span class="sourceLineNo">191</span> /**<a name="line.191"></a>
@@ -201,230 +201,239 @@
<span class="sourceLineNo">193</span> * Callers should use the equals method to compare returned instances, though we may return<a name="line.193"></a>
<span class="sourceLineNo">194</span> * a shared immutable object as an internal optimization.<a name="line.194"></a>
<span class="sourceLineNo">195</span> */<a name="line.195"></a>
-<span class="sourceLineNo">196</span> public static ServerName valueOf(final String hostAndPort, final long startCode) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return new ServerName(hostAndPort, startCode);<a name="line.197"></a>
+<span class="sourceLineNo">196</span> public static ServerName valueOf(final String serverName) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return INTERN_POOL.intern(new ServerName(serverName));<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 String toString() {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return getServerName();<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> /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * @return Return a SHORT version of {@link ServerName#toString()}, one that has the host only,<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * minus the domain, and the port only -- no start code; the String is for us internally mostly<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * tying threads to their server. Not for external use. It is lossy and will not work in<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * in compares, etc.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> public String toShortString() {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return Addressing.createHostAndPortStr(<a name="line.212"></a>
-<span class="sourceLineNo">213</span> getHostNameMinusDomain(this.address.getHostname()),<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.address.getPort());<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<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> * @return {@link #getServerName()} as bytes with a short-sized prefix with<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * the ServerName#VERSION of this class.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> */<a name="line.220"></a>
-<span class="sourceLineNo">221</span> public synchronized byte [] getVersionedBytes() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (this.bytes == null) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> this.bytes = Bytes.add(VERSION_BYTES, Bytes.toBytes(getServerName()));<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return this.bytes;<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> public String getServerName() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return servername;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> public String getHostname() {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return this.address.getHostname();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> public String getHostnameLowerCase() {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> return this.address.getHostname().toLowerCase(Locale.ROOT);<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> public int getPort() {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> return this.address.getPort();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> public long getStartcode() {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return startcode;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> /**<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * For internal use only.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * @param hostName<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @param port<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @param startcode<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @return Server name made of the concatenation of hostname, port and<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * startcode formatted as <code>&lt;hostname&gt; ',' &lt;port&gt; ',' &lt;startcode&gt;</code><a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @deprecated Since 2.0. Use {@link ServerName#valueOf(String, int, long)} instead.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> */<a name="line.256"></a>
-<span class="sourceLineNo">257</span> @Deprecated<a name="line.257"></a>
-<span class="sourceLineNo">258</span> // TODO: Make this private in hbase-3.0.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> static String getServerName(String hostName, int port, long startcode) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> final StringBuilder name = new StringBuilder(hostName.length() + 1 + 5 + 1 + 13);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> name.append(hostName.toLowerCase(Locale.ROOT));<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(port);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> name.append(SERVERNAME_SEPARATOR);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> name.append(startcode);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return name.toString();<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 hostAndPort String in form of &lt;hostname&gt; ':' &lt;port&gt;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @param startcode<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * @return Server name made of the concatenation of hostname, port and<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * startcode formatted as <code>&lt;hostname&gt; ',' &lt;port&gt; ',' &lt;startcode&gt;</code><a name="line.273"></a>
-<span class="sourceLineNo">274</span> * @deprecated Since 2.0. Use {@link ServerName#valueOf(String, long)} instead.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> */<a name="line.275"></a>
-<span class="sourceLineNo">276</span> @Deprecated<a name="line.276"></a>
-<span class="sourceLineNo">277</span> public static String getServerName(final String hostAndPort,<a name="line.277"></a>
-<span class="sourceLineNo">278</span> final long startcode) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> int index = hostAndPort.indexOf(":");<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (index <= 0) throw new IllegalArgumentException("Expected <hostname> ':' <port>");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return getServerName(hostAndPort.substring(0, index),<a name="line.281"></a>
-<span class="sourceLineNo">282</span> Integer.parseInt(hostAndPort.substring(index + 1)), startcode);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * @return Hostname and port formatted as described at<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * {@link Addressing#createHostAndPortStr(String, int)}<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * @deprecated Since 2.0. Use {@link #getAddress()} instead.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> */<a name="line.289"></a>
-<span class="sourceLineNo">290</span> @Deprecated<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public String getHostAndPort() {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return this.address.toString();<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> public Address getAddress() {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> return this.address;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> /**<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * @param serverName ServerName in form specified by {@link #getServerName()}<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * @return The server start code parsed from <code>servername</code><a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @deprecated Since 2.0. Use instance of ServerName to pull out start code.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> */<a name="line.303"></a>
-<span class="sourceLineNo">304</span> @Deprecated<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public static long getServerStartcodeFromServerName(final String serverName) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> int index = serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> return Long.parseLong(serverName.substring(index + 1));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> /**<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * Utility method to excise the start code from a server name<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * @param inServerName full server name<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * @return server name less its start code<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @deprecated Since 2.0. Use {@link #getAddress()}<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> @Deprecated<a name="line.316"></a>
-<span class="sourceLineNo">317</span> public static String getServerNameLessStartCode(String inServerName) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> if (inServerName != null && inServerName.length() > 0) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> int index = inServerName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (index > 0) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return inServerName.substring(0, index);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span> return inServerName;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public int compareTo(ServerName other) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> int compare;<a name="line.329"></a>
-<span class="sourceLineNo">330</span> if (other == null) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> return -1;<a name="line.331"></a>
+<span class="sourceLineNo">200</span> /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * Retrieve an instance of ServerName.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * Callers should use the equals method to compare returned instances, though we may return<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * a shared immutable object as an internal optimization.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public static ServerName valueOf(final String hostAndPort, final long startCode) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return INTERN_POOL.intern(new ServerName(hostAndPort, startCode));<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> @Override<a name="line.209"></a>
+<span class="sourceLineNo">210</span> public String toString() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return getServerName();<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> /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * @return Return a SHORT version of {@link ServerName#toString()}, one that has the host only,<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * minus the domain, and the port only -- no start code; the String is for us internally mostly<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * tying threads to their server. Not for external use. It is lossy and will not work in<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * in compares, etc.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> */<a name="line.219"></a>
+<span class="sourceLineNo">220</span> public String toShortString() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return Addressing.createHostAndPortStr(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> getHostNameMinusDomain(this.address.getHostname()),<a name="line.222"></a>
+<span class="sourceLineNo">223</span> this.address.getPort());<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * @return {@link #getServerName()} as bytes with a short-sized prefix with<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * the ServerName#VERSION of this class.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> */<a name="line.229"></a>
+<span class="sourceLineNo">230</span> public synchronized byte [] getVersionedBytes() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (this.bytes == null) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> this.bytes = Bytes.add(VERSION_BYTES, Bytes.toBytes(getServerName()));<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> return this.bytes;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> public String getServerName() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return servername;<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> public String getHostname() {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> return this.address.getHostname();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> public String getHostnameLowerCase() {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return this.address.getHostname().toLowerCase(Locale.ROOT);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> public int getPort() {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return this.address.getPort();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> public long getStartcode() {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> return startcode;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * For internal use only.<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * @param hostName<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @param port<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * @param startcode<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @return Server name made of the concatenation of hostname, port and<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * startcode formatted as <code>&lt;hostname&gt; ',' &lt;port&gt; ',' &lt;startcode&gt;</code><a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @deprecated Since 2.0. Use {@link ServerName#valueOf(String, int, long)} instead.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> @Deprecated<a name="line.266"></a>
+<span class="sourceLineNo">267</span> // TODO: Make this private in hbase-3.0.<a name="line.267"></a>
+<span class="sourceLineNo">268</span> static String getServerName(String hostName, int port, long startcode) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> final StringBuilder name = new StringBuilder(hostName.length() + 1 + 5 + 1 + 13);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> name.append(hostName.toLowerCase(Locale.ROOT));<a name="line.270"></a>
+<span class="sourceLineNo">271</span> name.append(SERVERNAME_SEPARATOR);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> name.append(port);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> name.append(SERVERNAME_SEPARATOR);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> name.append(startcode);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return name.toString();<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> * @param hostAndPort String in form of &lt;hostname&gt; ':' &lt;port&gt;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * @param startcode<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * @return Server name made of the concatenation of hostname, port and<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * startcode formatted as <code>&lt;hostname&gt; ',' &lt;port&gt; ',' &lt;startcode&gt;</code><a name="line.282"></a>
+<span class="sourceLineNo">283</span> * @deprecated Since 2.0. Use {@link ServerName#valueOf(String, long)} instead.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> */<a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Deprecated<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public static String getServerName(final String hostAndPort,<a name="line.286"></a>
+<span class="sourceLineNo">287</span> final long startcode) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> int index = hostAndPort.indexOf(":");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (index <= 0) throw new IllegalArgumentException("Expected <hostname> ':' <port>");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> return getServerName(hostAndPort.substring(0, index),<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Integer.parseInt(hostAndPort.substring(index + 1)), startcode);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> /**<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * @return Hostname and port formatted as described at<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * {@link Addressing#createHostAndPortStr(String, int)}<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * @deprecated Since 2.0. Use {@link #getAddress()} instead.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> @Deprecated<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public String getHostAndPort() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return this.address.toString();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Address getAddress() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return this.address;<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> /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @param serverName ServerName in form specified by {@link #getServerName()}<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * @return The server start code parsed from <code>servername</code><a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @deprecated Since 2.0. Use instance of ServerName to pull out start code.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> */<a name="line.312"></a>
+<span class="sourceLineNo">313</span> @Deprecated<a name="line.313"></a>
+<span class="sourceLineNo">314</span> public static long getServerStartcodeFromServerName(final String serverName) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> int index = serverName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return Long.parseLong(serverName.substring(index + 1));<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> /**<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * Utility method to excise the start code from a server name<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * @param inServerName full server name<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * @return server name less its start code<a name="line.322"></a>
+<span class="sourceLineNo">323</span> * @deprecated Since 2.0. Use {@link #getAddress()}<a name="line.323"></a>
+<span class="sourceLineNo">324</span> */<a name="line.324"></a>
+<span class="sourceLineNo">325</span> @Deprecated<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public static String getServerNameLessStartCode(String inServerName) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> if (inServerName != null && inServerName.length() > 0) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> int index = inServerName.lastIndexOf(SERVERNAME_SEPARATOR);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (index > 0) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return inServerName.substring(0, index);<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (this.getHostname() == null) {<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> } else {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (other.getHostname() == null) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> return -1;<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span> compare = this.getHostname().compareToIgnoreCase(other.getHostname());<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if (compare != 0) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return compare;<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> compare = this.getPort() - other.getPort();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (compare != 0) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> return compare;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return Long.compare(this.getStartcode(), other.getStartcode());<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> @Override<a name="line.353"></a>
-<span class="sourceLineNo">354</span> public int hashCode() {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> return getServerName().hashCode();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> @Override<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public boolean equals(Object o) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (this == o) return true;<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (o == null) return false;<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (!(o instanceof ServerName)) return false;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> return this.compareTo((ServerName)o) == 0;<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> /**<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @param left<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * @param right<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * @return True if <code>other</code> has same hostname and port.<a name="line.369"></a>
-<span class="sourceLineNo">370</span> */<a name="line.370"></a>
-<span class="sourceLineNo">371</span> public static boolean isSameAddress(final ServerName left,<a name="line.371"></a>
-<span class="sourceLineNo">372</span> final ServerName right) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> // TODO: Make this left.getAddress().equals(right.getAddress())<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (left == null) return false;<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (right == null) return false;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &&<a name="line.376"></a>
-<span class="sourceLineNo">377</span> left.getPort() == right.getPort();<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> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Use this method instantiating a {@link ServerName} from bytes<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * gotten from a call to {@link #getVersionedBytes()}. Will take care of the<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * case where bytes were written by an earlier version of hbase.<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * @param versionedBytes Pass bytes gotten from a call to {@link #getVersionedBytes()}<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * @return A ServerName instance.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * @see #getVersionedBytes()<a name="line.386"></a>
-<span class="sourceLineNo">387</span> */<a name="line.387"></a>
-<span class="sourceLineNo">388</span> public static ServerName parseVersionedServerName(final byte [] versionedBytes) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> // Version is a short.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> short version = Bytes.toShort(versionedBytes);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (version == VERSION) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> int length = versionedBytes.length - Bytes.SIZEOF_SHORT;<a name="line.392"></a>
-<span class="sourceLineNo">393</span> return valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> // Presume the bytes were written with an old version of hbase and that the<a name="line.395"></a>
-<span class="sourceLineNo">396</span> // bytes are actually a String of the form "'<hostname>' ':' '<port>'".<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<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>
-<span class="sourceLineNo">401</span> * @param str Either an instance of {@link ServerName#toString()} or a<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * "'&lt;hostname&gt;' ':' '&lt;port&gt;'".<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * @return A ServerName instance.<a name="line.403"></a>
-<span class="sourceLineNo">404</span> */<a name="line.404"></a>
-<span class="sourceLineNo">405</span> public static ServerName parseServerName(final String str) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> return SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.406"></a>
-<span class="sourceLineNo">407</span> valueOf(str, NON_STARTCODE);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> /**<a name="line.411"></a>
-<span class="sourceLineNo">412</span> * @return true if the String follows the pattern of {@link ServerName#toString()}, false<a name="line.412"></a>
-<span class="sourceLineNo">413</span> * otherwise.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> */<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public static boolean isFullServerName(final String str){<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (str == null ||str.isEmpty()) return false;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return SERVERNAME_PATTERN.matcher(str).matches();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>}<a name="line.419"></a>
+<span class="sourceLineNo">333</span> return inServerName;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public int compareTo(ServerName other) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> int compare;<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (other == null) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return -1;<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> if (this.getHostname() == null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (other.getHostname() != null) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> return 1;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span> } else {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (other.getHostname() == null) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> return -1;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span> compare = this.getHostname().compareToIgnoreCase(other.getHostname());<a name="line.350"></a>
+<span class="sourceLineNo">351</span> if (compare != 0) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return compare;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span> compare = this.getPort() - other.getPort();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> if (compare != 0) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return compare;<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return Long.compare(this.getStartcode(), other.getStartcode());<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> @Override<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public int hashCode() {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return getServerName().hashCode();<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public boolean equals(Object o) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (this == o) return true;<a name="line.369"></a>
+<span class="sourceLineNo">370</span> if (o == null) return false;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> if (!(o instanceof ServerName)) return false;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> return this.compareTo((ServerName)o) == 0;<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> /**<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @param left<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * @param right<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @return True if <code>other</code> has same hostname and port.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static boolean isSameAddress(final ServerName left,<a name="line.380"></a>
+<span class="sourceLineNo">381</span> final ServerName right) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> // TODO: Make this left.getAddress().equals(right.getAddress())<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (left == null) return false;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> if (right == null) return false;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> return left.getHostname().compareToIgnoreCase(right.getHostname()) == 0 &&<a name="line.385"></a>
+<span class="sourceLineNo">386</span> left.getPort() == right.getPort();<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> * Use this method instantiating a {@link ServerName} from bytes<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * gotten from a call to {@link #getVersionedBytes()}. Will take care of the<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * case where bytes were written by an earlier version of hbase.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * @param versionedBytes Pass bytes gotten from a call to {@link #getVersionedBytes()}<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * @return A ServerName instance.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * @see #getVersionedBytes()<a name="line.395"></a>
+<span class="sourceLineNo">396</span> */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public static ServerName parseVersionedServerName(final byte [] versionedBytes) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> // Version is a short.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> short version = Bytes.toShort(versionedBytes);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> if (version == VERSION) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> int length = versionedBytes.length - Bytes.SIZEOF_SHORT;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> return valueOf(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span> // Presume the bytes were written with an old version of hbase and that the<a name="line.404"></a>
+<span class="sourceLineNo">405</span> // bytes are actually a String of the form "'<hostname>' ':' '<port>'".<a name="line.405"></a>
+<span class="sourceLineNo">406</span> return valueOf(Bytes.toString(versionedBytes), NON_STARTCODE);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * @param str Either an instance of {@link ServerName#toString()} or a<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * "'&lt;hostname&gt;' ':' '&lt;port&gt;'".<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * @return A ServerName instance.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> */<a name="line.413"></a>
+<span class="sourceLineNo">414</span> public static ServerName parseServerName(final String str) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> return SERVERNAME_PATTERN.matcher(str).matches()? valueOf(str) :<a name="line.415"></a>
+<span class="sourceLineNo">416</span> valueOf(str, NON_STARTCODE);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return true if the String follows the pattern of {@link ServerName#toString()}, false<a name="line.421"></a>
+<span class="sourceLineNo">422</span> * otherwise.<a name="line.422"></a>
+<span class="sourceLineNo">423</span> */<a name="line.423"></a>
+<span class="sourceLineNo">424</span> public static boolean isFullServerName(final String str){<a name="line.424"></a>
+<span class="sourceLineNo">425</span> if (str == null ||str.isEmpty()) return false;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> return SERVERNAME_PATTERN.matcher(str).matches();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>}<a name="line.428"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/df8fd1d3/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 51e1434..e44cfd7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
<span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
<span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
<span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span> public static final String revision = "03e596c6694a21768c51a3c52e1a032f51fd637c";<a name="line.11"></a>
+<span class="sourceLineNo">011</span> public static final String revision = "b4759ce6e72f50ccd9d410bd5917dc5a515414f1";<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String date = "Fri Jul 20 14:39:51 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String date = "Sun Jul 22 09:20:24 UTC 2018";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String srcChecksum = "a65d367fbccbdba17726b7d3fb69e5b3";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String srcChecksum = "3449ee861188a2ccacfbd7a165550672";<a name="line.15"></a>
<span class="sourceLineNo">016</span>}<a name="line.16"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/df8fd1d3/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
index f2266e9..8e1c20f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
@@ -277,45 +277,49 @@
<span class="sourceLineNo">269</span> return result;<a name="line.269"></a>
<span class="sourceLineNo">270</span> }<a name="line.270"></a>
<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> public synchronized void deleteFavoredNodesForRegions(Collection<RegionInfo> regionInfoList) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for (RegionInfo hri : regionInfoList) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> List<ServerName> favNodes = getFavoredNodes(hri);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (favNodes != null) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (primaryRSToRegionMap.containsKey(favNodes.get(PRIMARY.ordinal()))) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> primaryRSToRegionMap.get(favNodes.get(PRIMARY.ordinal())).remove(hri);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (secondaryRSToRegionMap.containsKey(favNodes.get(SECONDARY.ordinal()))) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> secondaryRSToRegionMap.get(favNodes.get(SECONDARY.ordinal())).remove(hri);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> if (teritiaryRSToRegionMap.containsKey(favNodes.get(TERTIARY.ordinal()))) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> teritiaryRSToRegionMap.get(favNodes.get(TERTIARY.ordinal())).remove(hri);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span> globalFavoredNodesAssignmentPlan.removeFavoredNodes(hri);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<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> @VisibleForTesting<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public synchronized Set<RegionInfo> getRegionsOfFavoredNode(ServerName serverName) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> Set<RegionInfo> regionInfos = Sets.newHashSet();<a name="line.292"></a>
+<span class="sourceLineNo">272</span> public synchronized void deleteFavoredNodesForRegion(RegionInfo regionInfo) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> List<ServerName> favNodes = getFavoredNodes(regionInfo);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (favNodes != null) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (primaryRSToRegionMap.containsKey(favNodes.get(PRIMARY.ordinal()))) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> primaryRSToRegionMap.get(favNodes.get(PRIMARY.ordinal())).remove(regionInfo);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (secondaryRSToRegionMap.containsKey(favNodes.get(SECONDARY.ordinal()))) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> secondaryRSToRegionMap.get(favNodes.get(SECONDARY.ordinal())).remove(regionInfo);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> if (teritiaryRSToRegionMap.containsKey(favNodes.get(TERTIARY.ordinal()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> teritiaryRSToRegionMap.get(favNodes.get(TERTIARY.ordinal())).remove(regionInfo);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> globalFavoredNodesAssignmentPlan.removeFavoredNodes(regionInfo);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> public synchronized void deleteFavoredNodesForRegions(Collection<RegionInfo> regionInfoList) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> for (RegionInfo regionInfo : regionInfoList) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> deleteFavoredNodesForRegion(regionInfo);<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><a name="line.293"></a>
-<span class="sourceLineNo">294</span> ServerName serverToUse = ServerName.valueOf(serverName.getHostAndPort(), NON_STARTCODE);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (primaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> regionInfos.addAll(primaryRSToRegionMap.get(serverToUse));<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (secondaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> regionInfos.addAll(secondaryRSToRegionMap.get(serverToUse));<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> if (teritiaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> regionInfos.addAll(teritiaryRSToRegionMap.get(serverToUse));<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> return regionInfos;<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> public RackManager getRackManager() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return rackManager;<a name="line.308"></a>
+<span class="sourceLineNo">294</span> @VisibleForTesting<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public synchronized Set<RegionInfo> getRegionsOfFavoredNode(ServerName serverName) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Set<RegionInfo> regionInfos = Sets.newHashSet();<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> ServerName serverToUse = ServerName.valueOf(serverName.getHostAndPort(), NON_STARTCODE);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> if (primaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> regionInfos.addAll(primaryRSToRegionMap.get(serverToUse));<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span> if (secondaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> regionInfos.addAll(secondaryRSToRegionMap.get(serverToUse));<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (teritiaryRSToRegionMap.containsKey(serverToUse)) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> regionInfos.addAll(teritiaryRSToRegionMap.get(serverToUse));<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return regionInfos;<a name="line.308"></a>
<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> public RackManager getRackManager() {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return rackManager;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>}<a name="line.314"></a>