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/05/09 15:31:55 UTC
[07/16] hbase-site git commit: Published site at
4f2dfd387779968d3b76a22f1f4189d3278b202d.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.TableRecordWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.TableRecordWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.TableRecordWriter.html
index fbdfc65..68ce820 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.TableRecordWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.TableRecordWriter.html
@@ -182,9 +182,9 @@
<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
<span class="sourceLineNo">175</span> public void checkOutputSpecs(JobContext context) throws IOException,<a name="line.175"></a>
<span class="sourceLineNo">176</span> InterruptedException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Configuration hConf = context.getConfiguration();<a name="line.177"></a>
+<span class="sourceLineNo">177</span> Configuration hConf = getConf();<a name="line.177"></a>
<span class="sourceLineNo">178</span> if (hConf == null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> hConf = this.conf;<a name="line.179"></a>
+<span class="sourceLineNo">179</span> hConf = context.getConfiguration();<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> try (Admin admin = ConnectionFactory.createConnection(hConf).getAdmin()) {<a name="line.182"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html
index fbdfc65..68ce820 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html
@@ -182,9 +182,9 @@
<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
<span class="sourceLineNo">175</span> public void checkOutputSpecs(JobContext context) throws IOException,<a name="line.175"></a>
<span class="sourceLineNo">176</span> InterruptedException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Configuration hConf = context.getConfiguration();<a name="line.177"></a>
+<span class="sourceLineNo">177</span> Configuration hConf = getConf();<a name="line.177"></a>
<span class="sourceLineNo">178</span> if (hConf == null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> hConf = this.conf;<a name="line.179"></a>
+<span class="sourceLineNo">179</span> hConf = context.getConfiguration();<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> try (Admin admin = ConnectionFactory.createConnection(hConf).getAdmin()) {<a name="line.182"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html
index 8861636..383a5f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html
@@ -44,121 +44,120 @@
<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> * Tracks the switch of split and merge states in ZK<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a name="line.41"></a>
-<span class="sourceLineNo">042</span>public class SplitOrMergeTracker {<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> private String splitZnode;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private String mergeZnode;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> private SwitchStateTracker splitStateTracker;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private SwitchStateTracker mergeStateTracker;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> public SplitOrMergeTracker(ZKWatcher watcher, Configuration conf,<a name="line.50"></a>
-<span class="sourceLineNo">051</span> Abortable abortable) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> try {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> if (ZKUtil.checkExists(watcher, watcher.znodePaths.switchZNode) < 0) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> ZKUtil.createAndFailSilent(watcher, watcher.znodePaths.switchZNode);<a name="line.54"></a>
-<span class="sourceLineNo">055</span> }<a name="line.55"></a>
-<span class="sourceLineNo">056</span> } catch (KeeperException e) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> throw new RuntimeException(e);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> splitZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.59"></a>
-<span class="sourceLineNo">060</span> conf.get("zookeeper.znode.switch.split", "split"));<a name="line.60"></a>
-<span class="sourceLineNo">061</span> mergeZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.61"></a>
-<span class="sourceLineNo">062</span> conf.get("zookeeper.znode.switch.merge", "merge"));<a name="line.62"></a>
-<span class="sourceLineNo">063</span> splitStateTracker = new SwitchStateTracker(watcher, splitZnode, abortable);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> mergeStateTracker = new SwitchStateTracker(watcher, mergeZnode, abortable);<a name="line.64"></a>
-<span class="sourceLineNo">065</span> }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> public void start() {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> splitStateTracker.start();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> mergeStateTracker.start();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> switch (switchType) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> case SPLIT:<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return splitStateTracker.isSwitchEnabled();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> case MERGE:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> return mergeStateTracker.isSwitchEnabled();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> default:<a name="line.78"></a>
-<span class="sourceLineNo">079</span> break;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return false;<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> public void setSplitOrMergeEnabled(boolean enabled, MasterSwitchType switchType)<a name="line.84"></a>
-<span class="sourceLineNo">085</span> throws KeeperException {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> switch (switchType) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> case SPLIT:<a name="line.87"></a>
-<span class="sourceLineNo">088</span> splitStateTracker.setSwitchEnabled(enabled);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> break;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> case MERGE:<a name="line.90"></a>
-<span class="sourceLineNo">091</span> mergeStateTracker.setSwitchEnabled(enabled);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> break;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> default:<a name="line.93"></a>
-<span class="sourceLineNo">094</span> break;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<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> private static class SwitchStateTracker extends ZKNodeTracker {<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> public SwitchStateTracker(ZKWatcher watcher, String node, Abortable abortable) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> super(watcher, node, abortable);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Return true if the switch is on, false otherwise<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public boolean isSwitchEnabled() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> byte [] upData = super.getData(false);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> try {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // if data in ZK is null, use default of on.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return upData == null || parseFrom(upData).getEnabled();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> } catch (DeserializationException dex) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> LOG.error("ZK state for LoadBalancer could not be parsed " + Bytes.toStringBinary(upData));<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // return false to be safe.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return false;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<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> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * Set the switch on/off<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param enabled switch enabled or not?<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @throws KeeperException keepException will be thrown out<a name="line.122"></a>
-<span class="sourceLineNo">123</span> */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setSwitchEnabled(boolean enabled) throws KeeperException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> byte [] upData = toByteArray(enabled);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> try {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> ZKUtil.setData(watcher, node, upData);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> } catch(KeeperException.NoNodeException nne) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> ZKUtil.createAndWatch(watcher, node, upData);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span> super.nodeDataChanged(node);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> private byte [] toByteArray(boolean enabled) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> builder.setEnabled(enabled);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return ProtobufUtil.prependPBMagic(builder.build().toByteArray());<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> private SwitchState parseFrom(byte [] bytes)<a name="line.140"></a>
-<span class="sourceLineNo">141</span> throws DeserializationException {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> ProtobufUtil.mergeFrom(builder, bytes, magicLen, bytes.length - magicLen);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> } catch (IOException e) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> throw new DeserializationException(e);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return builder.build();<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">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a name="line.40"></a>
+<span class="sourceLineNo">041</span>public class SplitOrMergeTracker {<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> private String splitZnode;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private String mergeZnode;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span> private SwitchStateTracker splitStateTracker;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> private SwitchStateTracker mergeStateTracker;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> public SplitOrMergeTracker(ZKWatcher watcher, Configuration conf,<a name="line.49"></a>
+<span class="sourceLineNo">050</span> Abortable abortable) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> try {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> if (ZKUtil.checkExists(watcher, watcher.znodePaths.switchZNode) < 0) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> ZKUtil.createAndFailSilent(watcher, watcher.znodePaths.switchZNode);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span> } catch (KeeperException e) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> throw new RuntimeException(e);<a name="line.56"></a>
+<span class="sourceLineNo">057</span> }<a name="line.57"></a>
+<span class="sourceLineNo">058</span> splitZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.58"></a>
+<span class="sourceLineNo">059</span> conf.get("zookeeper.znode.switch.split", "split"));<a name="line.59"></a>
+<span class="sourceLineNo">060</span> mergeZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.60"></a>
+<span class="sourceLineNo">061</span> conf.get("zookeeper.znode.switch.merge", "merge"));<a name="line.61"></a>
+<span class="sourceLineNo">062</span> splitStateTracker = new SwitchStateTracker(watcher, splitZnode, abortable);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> mergeStateTracker = new SwitchStateTracker(watcher, mergeZnode, abortable);<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> public void start() {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> splitStateTracker.start();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> mergeStateTracker.start();<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> public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> switch (switchType) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> case SPLIT:<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return splitStateTracker.isSwitchEnabled();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> case MERGE:<a name="line.75"></a>
+<span class="sourceLineNo">076</span> return mergeStateTracker.isSwitchEnabled();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> break;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span> return false;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> public void setSplitOrMergeEnabled(boolean enabled, MasterSwitchType switchType)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> throws KeeperException {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> switch (switchType) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> case SPLIT:<a name="line.86"></a>
+<span class="sourceLineNo">087</span> splitStateTracker.setSwitchEnabled(enabled);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> break;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> case MERGE:<a name="line.89"></a>
+<span class="sourceLineNo">090</span> mergeStateTracker.setSwitchEnabled(enabled);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> break;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> default:<a name="line.92"></a>
+<span class="sourceLineNo">093</span> break;<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><a name="line.96"></a>
+<span class="sourceLineNo">097</span> private static class SwitchStateTracker extends ZKNodeTracker {<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> public SwitchStateTracker(ZKWatcher watcher, String node, Abortable abortable) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> super(watcher, node, abortable);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Return true if the switch is on, false otherwise<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public boolean isSwitchEnabled() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> byte [] upData = super.getData(false);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> try {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // if data in ZK is null, use default of on.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return upData == null || parseFrom(upData).getEnabled();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> } catch (DeserializationException dex) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> LOG.error("ZK state for LoadBalancer could not be parsed " + Bytes.toStringBinary(upData));<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // return false to be safe.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return false;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<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> * Set the switch on/off<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param enabled switch enabled or not?<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @throws KeeperException keepException will be thrown out<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public void setSwitchEnabled(boolean enabled) throws KeeperException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> byte [] upData = toByteArray(enabled);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ZKUtil.setData(watcher, node, upData);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } catch(KeeperException.NoNodeException nne) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> ZKUtil.createAndWatch(watcher, node, upData);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> super.nodeDataChanged(node);<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> private byte [] toByteArray(boolean enabled) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> builder.setEnabled(enabled);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return ProtobufUtil.prependPBMagic(builder.build().toByteArray());<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> private SwitchState parseFrom(byte [] bytes)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws DeserializationException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProtobufUtil.mergeFrom(builder, bytes, magicLen, bytes.length - magicLen);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (IOException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> throw new DeserializationException(e);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return builder.build();<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.html
index 8861636..383a5f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/SplitOrMergeTracker.html
@@ -44,121 +44,120 @@
<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> * Tracks the switch of split and merge states in ZK<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a name="line.41"></a>
-<span class="sourceLineNo">042</span>public class SplitOrMergeTracker {<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> private String splitZnode;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private String mergeZnode;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> private SwitchStateTracker splitStateTracker;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private SwitchStateTracker mergeStateTracker;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> public SplitOrMergeTracker(ZKWatcher watcher, Configuration conf,<a name="line.50"></a>
-<span class="sourceLineNo">051</span> Abortable abortable) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> try {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> if (ZKUtil.checkExists(watcher, watcher.znodePaths.switchZNode) < 0) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> ZKUtil.createAndFailSilent(watcher, watcher.znodePaths.switchZNode);<a name="line.54"></a>
-<span class="sourceLineNo">055</span> }<a name="line.55"></a>
-<span class="sourceLineNo">056</span> } catch (KeeperException e) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> throw new RuntimeException(e);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> splitZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.59"></a>
-<span class="sourceLineNo">060</span> conf.get("zookeeper.znode.switch.split", "split"));<a name="line.60"></a>
-<span class="sourceLineNo">061</span> mergeZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.61"></a>
-<span class="sourceLineNo">062</span> conf.get("zookeeper.znode.switch.merge", "merge"));<a name="line.62"></a>
-<span class="sourceLineNo">063</span> splitStateTracker = new SwitchStateTracker(watcher, splitZnode, abortable);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> mergeStateTracker = new SwitchStateTracker(watcher, mergeZnode, abortable);<a name="line.64"></a>
-<span class="sourceLineNo">065</span> }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> public void start() {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> splitStateTracker.start();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> mergeStateTracker.start();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> switch (switchType) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> case SPLIT:<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return splitStateTracker.isSwitchEnabled();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> case MERGE:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> return mergeStateTracker.isSwitchEnabled();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> default:<a name="line.78"></a>
-<span class="sourceLineNo">079</span> break;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return false;<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> public void setSplitOrMergeEnabled(boolean enabled, MasterSwitchType switchType)<a name="line.84"></a>
-<span class="sourceLineNo">085</span> throws KeeperException {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> switch (switchType) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> case SPLIT:<a name="line.87"></a>
-<span class="sourceLineNo">088</span> splitStateTracker.setSwitchEnabled(enabled);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> break;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> case MERGE:<a name="line.90"></a>
-<span class="sourceLineNo">091</span> mergeStateTracker.setSwitchEnabled(enabled);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> break;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> default:<a name="line.93"></a>
-<span class="sourceLineNo">094</span> break;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<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> private static class SwitchStateTracker extends ZKNodeTracker {<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> public SwitchStateTracker(ZKWatcher watcher, String node, Abortable abortable) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> super(watcher, node, abortable);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Return true if the switch is on, false otherwise<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public boolean isSwitchEnabled() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> byte [] upData = super.getData(false);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> try {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // if data in ZK is null, use default of on.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return upData == null || parseFrom(upData).getEnabled();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> } catch (DeserializationException dex) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> LOG.error("ZK state for LoadBalancer could not be parsed " + Bytes.toStringBinary(upData));<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // return false to be safe.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return false;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<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> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * Set the switch on/off<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param enabled switch enabled or not?<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @throws KeeperException keepException will be thrown out<a name="line.122"></a>
-<span class="sourceLineNo">123</span> */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setSwitchEnabled(boolean enabled) throws KeeperException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> byte [] upData = toByteArray(enabled);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> try {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> ZKUtil.setData(watcher, node, upData);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> } catch(KeeperException.NoNodeException nne) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> ZKUtil.createAndWatch(watcher, node, upData);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span> super.nodeDataChanged(node);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> private byte [] toByteArray(boolean enabled) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> builder.setEnabled(enabled);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return ProtobufUtil.prependPBMagic(builder.build().toByteArray());<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> private SwitchState parseFrom(byte [] bytes)<a name="line.140"></a>
-<span class="sourceLineNo">141</span> throws DeserializationException {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> ProtobufUtil.mergeFrom(builder, bytes, magicLen, bytes.length - magicLen);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> } catch (IOException e) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> throw new DeserializationException(e);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return builder.build();<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">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a name="line.40"></a>
+<span class="sourceLineNo">041</span>public class SplitOrMergeTracker {<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> private String splitZnode;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private String mergeZnode;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span> private SwitchStateTracker splitStateTracker;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> private SwitchStateTracker mergeStateTracker;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> public SplitOrMergeTracker(ZKWatcher watcher, Configuration conf,<a name="line.49"></a>
+<span class="sourceLineNo">050</span> Abortable abortable) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> try {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> if (ZKUtil.checkExists(watcher, watcher.znodePaths.switchZNode) < 0) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> ZKUtil.createAndFailSilent(watcher, watcher.znodePaths.switchZNode);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span> } catch (KeeperException e) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> throw new RuntimeException(e);<a name="line.56"></a>
+<span class="sourceLineNo">057</span> }<a name="line.57"></a>
+<span class="sourceLineNo">058</span> splitZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.58"></a>
+<span class="sourceLineNo">059</span> conf.get("zookeeper.znode.switch.split", "split"));<a name="line.59"></a>
+<span class="sourceLineNo">060</span> mergeZnode = ZNodePaths.joinZNode(watcher.znodePaths.switchZNode,<a name="line.60"></a>
+<span class="sourceLineNo">061</span> conf.get("zookeeper.znode.switch.merge", "merge"));<a name="line.61"></a>
+<span class="sourceLineNo">062</span> splitStateTracker = new SwitchStateTracker(watcher, splitZnode, abortable);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> mergeStateTracker = new SwitchStateTracker(watcher, mergeZnode, abortable);<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> public void start() {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> splitStateTracker.start();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> mergeStateTracker.start();<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> public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> switch (switchType) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> case SPLIT:<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return splitStateTracker.isSwitchEnabled();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> case MERGE:<a name="line.75"></a>
+<span class="sourceLineNo">076</span> return mergeStateTracker.isSwitchEnabled();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> break;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span> return false;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> public void setSplitOrMergeEnabled(boolean enabled, MasterSwitchType switchType)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> throws KeeperException {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> switch (switchType) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> case SPLIT:<a name="line.86"></a>
+<span class="sourceLineNo">087</span> splitStateTracker.setSwitchEnabled(enabled);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> break;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> case MERGE:<a name="line.89"></a>
+<span class="sourceLineNo">090</span> mergeStateTracker.setSwitchEnabled(enabled);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> break;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> default:<a name="line.92"></a>
+<span class="sourceLineNo">093</span> break;<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><a name="line.96"></a>
+<span class="sourceLineNo">097</span> private static class SwitchStateTracker extends ZKNodeTracker {<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> public SwitchStateTracker(ZKWatcher watcher, String node, Abortable abortable) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> super(watcher, node, abortable);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Return true if the switch is on, false otherwise<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public boolean isSwitchEnabled() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> byte [] upData = super.getData(false);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> try {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // if data in ZK is null, use default of on.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return upData == null || parseFrom(upData).getEnabled();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> } catch (DeserializationException dex) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> LOG.error("ZK state for LoadBalancer could not be parsed " + Bytes.toStringBinary(upData));<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // return false to be safe.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return false;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<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> * Set the switch on/off<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param enabled switch enabled or not?<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @throws KeeperException keepException will be thrown out<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public void setSwitchEnabled(boolean enabled) throws KeeperException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> byte [] upData = toByteArray(enabled);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ZKUtil.setData(watcher, node, upData);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } catch(KeeperException.NoNodeException nne) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> ZKUtil.createAndWatch(watcher, node, upData);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> super.nodeDataChanged(node);<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> private byte [] toByteArray(boolean enabled) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> builder.setEnabled(enabled);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return ProtobufUtil.prependPBMagic(builder.build().toByteArray());<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> private SwitchState parseFrom(byte [] bytes)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws DeserializationException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> SwitchState.Builder builder = SwitchState.newBuilder();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProtobufUtil.mergeFrom(builder, bytes, magicLen, bytes.length - magicLen);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (IOException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> throw new DeserializationException(e);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return builder.build();<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.InMemoryFlushRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.InMemoryFlushRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.InMemoryFlushRunnable.html
index 01b8a09..d4390be 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.InMemoryFlushRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.InMemoryFlushRunnable.html
@@ -66,7 +66,7 @@
<span class="sourceLineNo">058</span> public static final String COMPACTING_MEMSTORE_TYPE_KEY =<a name="line.58"></a>
<span class="sourceLineNo">059</span> "hbase.hregion.compacting.memstore.type";<a name="line.59"></a>
<span class="sourceLineNo">060</span> public static final String COMPACTING_MEMSTORE_TYPE_DEFAULT =<a name="line.60"></a>
-<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.BASIC);<a name="line.61"></a>
+<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.NONE);<a name="line.61"></a>
<span class="sourceLineNo">062</span> // Default fraction of in-memory-flush size w.r.t. flush-to-disk size<a name="line.62"></a>
<span class="sourceLineNo">063</span> public static final String IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY =<a name="line.63"></a>
<span class="sourceLineNo">064</span> "hbase.memstore.inmemoryflush.threshold.factor";<a name="line.64"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html
index 01b8a09..d4390be 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html
@@ -66,7 +66,7 @@
<span class="sourceLineNo">058</span> public static final String COMPACTING_MEMSTORE_TYPE_KEY =<a name="line.58"></a>
<span class="sourceLineNo">059</span> "hbase.hregion.compacting.memstore.type";<a name="line.59"></a>
<span class="sourceLineNo">060</span> public static final String COMPACTING_MEMSTORE_TYPE_DEFAULT =<a name="line.60"></a>
-<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.BASIC);<a name="line.61"></a>
+<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.NONE);<a name="line.61"></a>
<span class="sourceLineNo">062</span> // Default fraction of in-memory-flush size w.r.t. flush-to-disk size<a name="line.62"></a>
<span class="sourceLineNo">063</span> public static final String IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY =<a name="line.63"></a>
<span class="sourceLineNo">064</span> "hbase.memstore.inmemoryflush.threshold.factor";<a name="line.64"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html
index 01b8a09..d4390be 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html
@@ -66,7 +66,7 @@
<span class="sourceLineNo">058</span> public static final String COMPACTING_MEMSTORE_TYPE_KEY =<a name="line.58"></a>
<span class="sourceLineNo">059</span> "hbase.hregion.compacting.memstore.type";<a name="line.59"></a>
<span class="sourceLineNo">060</span> public static final String COMPACTING_MEMSTORE_TYPE_DEFAULT =<a name="line.60"></a>
-<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.BASIC);<a name="line.61"></a>
+<span class="sourceLineNo">061</span> String.valueOf(MemoryCompactionPolicy.NONE);<a name="line.61"></a>
<span class="sourceLineNo">062</span> // Default fraction of in-memory-flush size w.r.t. flush-to-disk size<a name="line.62"></a>
<span class="sourceLineNo">063</span> public static final String IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY =<a name="line.63"></a>
<span class="sourceLineNo">064</span> "hbase.memstore.inmemoryflush.threshold.factor";<a name="line.64"></a>