You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/05 17:46:04 UTC
[07/51] [partial] hbase-site git commit: Published site at
6f6a8ed71fe98b83e8a8db974fc15b0d8597b174.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1b9384b2/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
index a74e672..e22025e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
@@ -107,7 +107,7 @@
<span class="sourceLineNo">099</span> private final int VERSION_2 = -1;<a name="line.99"></a>
<span class="sourceLineNo">100</span> private final boolean isReplay;<a name="line.100"></a>
<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> private ArrayList<Cell> cells = new ArrayList<Cell>(1);<a name="line.102"></a>
+<span class="sourceLineNo">102</span> private ArrayList<Cell> cells = null;<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
<span class="sourceLineNo">104</span> public static final WALEdit EMPTY_WALEDIT = new WALEdit();<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
@@ -126,273 +126,279 @@
<span class="sourceLineNo">118</span><a name="line.118"></a>
<span class="sourceLineNo">119</span> public WALEdit(boolean isReplay) {<a name="line.119"></a>
<span class="sourceLineNo">120</span> this.isReplay = isReplay;<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 f<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @return True is <code>f</code> is {@link #METAFAMILY}<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public static boolean isMetaEditFamily(final byte [] f) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return Bytes.equals(METAFAMILY, f);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> public static boolean isMetaEditFamily(Cell cell) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return CellUtil.matchingFamily(cell, METAFAMILY);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean isMetaEdit() {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> for (Cell cell: cells) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (!isMetaEditFamily(cell)) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> return false;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return true;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @return True when current WALEdit is created by log replay. Replication skips WALEdits from<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * replay.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public boolean isReplay() {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return this.isReplay;<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> public void setCompressionContext(final CompressionContext compressionContext) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> this.compressionContext = compressionContext;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> public WALEdit add(Cell cell) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.cells.add(cell);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> return this;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> public boolean isEmpty() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return cells.isEmpty();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> public int size() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return cells.size();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> public ArrayList<Cell> getCells() {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> return cells;<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> * This is not thread safe.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * This will change the WALEdit and shouldn't be used unless you are sure that nothing<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * else depends on the contents being immutable.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> *<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @param cells the list of cells that this WALEdit now contains.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> */<a name="line.179"></a>
-<span class="sourceLineNo">180</span> @InterfaceAudience.Private<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public void setCells(ArrayList<Cell> cells) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.cells = cells;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> public NavigableMap<byte[], Integer> getAndRemoveScopes() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> NavigableMap<byte[], Integer> result = scopes;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> scopes = null;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return result;<a name="line.188"></a>
+<span class="sourceLineNo">121</span> cells = new ArrayList<Cell>(1);<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> public WALEdit(int cellCount) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> this.isReplay = false;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> cells = new ArrayList<Cell>(cellCount);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @param f<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @return True is <code>f</code> is {@link #METAFAMILY}<a name="line.131"></a>
+<span class="sourceLineNo">132</span> */<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static boolean isMetaEditFamily(final byte [] f) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return Bytes.equals(METAFAMILY, f);<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> public static boolean isMetaEditFamily(Cell cell) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> return CellUtil.matchingFamily(cell, METAFAMILY);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> public boolean isMetaEdit() {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> for (Cell cell: cells) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (!isMetaEditFamily(cell)) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return false;<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> return true;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return True when current WALEdit is created by log replay. Replication skips WALEdits from<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * replay.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public boolean isReplay() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return this.isReplay;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> public void setCompressionContext(final CompressionContext compressionContext) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> this.compressionContext = compressionContext;<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> public WALEdit add(Cell cell) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> this.cells.add(cell);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return this;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> public boolean isEmpty() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return cells.isEmpty();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> public int size() {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return cells.size();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> public ArrayList<Cell> getCells() {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return cells;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * This is not thread safe.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * This will change the WALEdit and shouldn't be used unless you are sure that nothing<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * else depends on the contents being immutable.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> *<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param cells the list of cells that this WALEdit now contains.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> */<a name="line.185"></a>
+<span class="sourceLineNo">186</span> @InterfaceAudience.Private<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public void setCells(ArrayList<Cell> cells) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> this.cells = cells;<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> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void readFields(DataInput in) throws IOException {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> cells.clear();<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (scopes != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> scopes.clear();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> int versionOrLength = in.readInt();<a name="line.197"></a>
-<span class="sourceLineNo">198</span> // TODO: Change version when we protobuf. Also, change way we serialize KV! Pb it too.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> if (versionOrLength == VERSION_2) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> // this is new style WAL entry containing multiple KeyValues.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> int numEdits = in.readInt();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (int idx = 0; idx < numEdits; idx++) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (compressionContext != null) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> this.add(KeyValueCompression.readKV(in, compressionContext));<a name="line.204"></a>
-<span class="sourceLineNo">205</span> } else {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> this.add(KeyValueUtil.create(in));<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> int numFamilies = in.readInt();<a name="line.209"></a>
-<span class="sourceLineNo">210</span> if (numFamilies > 0) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (scopes == null) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR);<a name="line.212"></a>
+<span class="sourceLineNo">191</span> public NavigableMap<byte[], Integer> getAndRemoveScopes() {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> NavigableMap<byte[], Integer> result = scopes;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> scopes = null;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> return result;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> @Override<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public void readFields(DataInput in) throws IOException {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> cells.clear();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (scopes != null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> scopes.clear();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> int versionOrLength = in.readInt();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> // TODO: Change version when we protobuf. Also, change way we serialize KV! Pb it too.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> if (versionOrLength == VERSION_2) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> // this is new style WAL entry containing multiple KeyValues.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> int numEdits = in.readInt();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> for (int idx = 0; idx < numEdits; idx++) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (compressionContext != null) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> this.add(KeyValueCompression.readKV(in, compressionContext));<a name="line.210"></a>
+<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> this.add(KeyValueUtil.create(in));<a name="line.212"></a>
<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span> for (int i = 0; i < numFamilies; i++) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> byte[] fam = Bytes.readByteArray(in);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> int scope = in.readInt();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> scopes.put(fam, scope);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> } else {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // this is an old style WAL entry. The int that we just<a name="line.221"></a>
-<span class="sourceLineNo">222</span> // read is actually the length of a single KeyValue<a name="line.222"></a>
-<span class="sourceLineNo">223</span> this.add(KeyValueUtil.create(versionOrLength, in));<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> @Override<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public void write(DataOutput out) throws IOException {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> LOG.warn("WALEdit is being serialized to writable - only expected in test code");<a name="line.229"></a>
-<span class="sourceLineNo">230</span> out.writeInt(VERSION_2);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> out.writeInt(cells.size());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> // We interleave the two lists for code simplicity<a name="line.232"></a>
-<span class="sourceLineNo">233</span> for (Cell cell : cells) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> // This is not used in any of the core code flows so it is just fine to convert to KV<a name="line.234"></a>
-<span class="sourceLineNo">235</span> KeyValue kv = KeyValueUtil.ensureKeyValue(cell);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (compressionContext != null) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> KeyValueCompression.writeKV(out, kv, compressionContext);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> } else{<a name="line.238"></a>
-<span class="sourceLineNo">239</span> KeyValueUtil.write(kv, out);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (scopes == null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> out.writeInt(0);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> } else {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> out.writeInt(scopes.size());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> for (byte[] key : scopes.keySet()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Bytes.writeByteArray(out, key);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> out.writeInt(scopes.get(key));<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<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> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Reads WALEdit from cells.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @param cellDecoder Cell decoder.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @param expectedCount Expected cell count.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @return Number of KVs read.<a name="line.257"></a>
-<span class="sourceLineNo">258</span> */<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public int readFromCells(Codec.Decoder cellDecoder, int expectedCount) throws IOException {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> cells.clear();<a name="line.260"></a>
-<span class="sourceLineNo">261</span> cells.ensureCapacity(expectedCount);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> while (cells.size() < expectedCount && cellDecoder.advance()) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> cells.add(cellDecoder.current());<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return cells.size();<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> @Override<a name="line.268"></a>
-<span class="sourceLineNo">269</span> public long heapSize() {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> long ret = ClassSize.ARRAYLIST;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> for (Cell cell : cells) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> ret += CellUtil.estimatedHeapSizeOf(cell);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (scopes != null) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> ret += ClassSize.TREEMAP;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> ret += ClassSize.align(scopes.size() * ClassSize.MAP_ENTRY);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> // TODO this isn't quite right, need help here<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return ret;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @Override<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public String toString() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> StringBuilder sb = new StringBuilder();<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> sb.append("[#edits: " + cells.size() + " = <");<a name="line.286"></a>
-<span class="sourceLineNo">287</span> for (Cell cell : cells) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> sb.append(cell);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> sb.append("; ");<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (scopes != null) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> sb.append(" scopes: " + scopes.toString());<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span> sb.append(">]");<a name="line.294"></a>
-<span class="sourceLineNo">295</span> return sb.toString();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public static WALEdit createFlushWALEdit(HRegionInfo hri, FlushDescriptor f) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, FLUSH,<a name="line.299"></a>
-<span class="sourceLineNo">300</span> EnvironmentEdgeManager.currentTime(), f.toByteArray());<a name="line.300"></a>
-<span class="sourceLineNo">301</span> return new WALEdit().add(kv);<a name="line.301"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> int numFamilies = in.readInt();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (numFamilies > 0) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (scopes == null) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> for (int i = 0; i < numFamilies; i++) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> byte[] fam = Bytes.readByteArray(in);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> int scope = in.readInt();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> scopes.put(fam, scope);<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> } else {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // this is an old style WAL entry. The int that we just<a name="line.227"></a>
+<span class="sourceLineNo">228</span> // read is actually the length of a single KeyValue<a name="line.228"></a>
+<span class="sourceLineNo">229</span> this.add(KeyValueUtil.create(versionOrLength, in));<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><a name="line.232"></a>
+<span class="sourceLineNo">233</span> @Override<a name="line.233"></a>
+<span class="sourceLineNo">234</span> public void write(DataOutput out) throws IOException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> LOG.warn("WALEdit is being serialized to writable - only expected in test code");<a name="line.235"></a>
+<span class="sourceLineNo">236</span> out.writeInt(VERSION_2);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> out.writeInt(cells.size());<a name="line.237"></a>
+<span class="sourceLineNo">238</span> // We interleave the two lists for code simplicity<a name="line.238"></a>
+<span class="sourceLineNo">239</span> for (Cell cell : cells) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> // This is not used in any of the core code flows so it is just fine to convert to KV<a name="line.240"></a>
+<span class="sourceLineNo">241</span> KeyValue kv = KeyValueUtil.ensureKeyValue(cell);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> if (compressionContext != null) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> KeyValueCompression.writeKV(out, kv, compressionContext);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> } else{<a name="line.244"></a>
+<span class="sourceLineNo">245</span> KeyValueUtil.write(kv, out);<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> if (scopes == null) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> out.writeInt(0);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> } else {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> out.writeInt(scopes.size());<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (byte[] key : scopes.keySet()) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> Bytes.writeByteArray(out, key);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> out.writeInt(scopes.get(key));<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><a name="line.258"></a>
+<span class="sourceLineNo">259</span> /**<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * Reads WALEdit from cells.<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * @param cellDecoder Cell decoder.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param expectedCount Expected cell count.<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @return Number of KVs read.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> public int readFromCells(Codec.Decoder cellDecoder, int expectedCount) throws IOException {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> cells.clear();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> cells.ensureCapacity(expectedCount);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> while (cells.size() < expectedCount && cellDecoder.advance()) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> cells.add(cellDecoder.current());<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return cells.size();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public long heapSize() {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> long ret = ClassSize.ARRAYLIST;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> for (Cell cell : cells) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> ret += CellUtil.estimatedHeapSizeOf(cell);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (scopes != null) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> ret += ClassSize.TREEMAP;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> ret += ClassSize.align(scopes.size() * ClassSize.MAP_ENTRY);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> // TODO this isn't quite right, need help here<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return ret;<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> @Override<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public String toString() {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> StringBuilder sb = new StringBuilder();<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> sb.append("[#edits: " + cells.size() + " = <");<a name="line.292"></a>
+<span class="sourceLineNo">293</span> for (Cell cell : cells) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> sb.append(cell);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> sb.append("; ");<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (scopes != null) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> sb.append(" scopes: " + scopes.toString());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> sb.append(">]");<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return sb.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 static FlushDescriptor getFlushDescriptor(Cell cell) throws IOException {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> if (CellUtil.matchingColumn(cell, METAFAMILY, FLUSH)) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return FlushDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return null;<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> public static WALEdit createRegionEventWALEdit(HRegionInfo hri,<a name="line.311"></a>
-<span class="sourceLineNo">312</span> RegionEventDescriptor regionEventDesc) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, REGION_EVENT,<a name="line.313"></a>
-<span class="sourceLineNo">314</span> EnvironmentEdgeManager.currentTime(), regionEventDesc.toByteArray());<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return new WALEdit().add(kv);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> public static RegionEventDescriptor getRegionEventDescriptor(Cell cell) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> if (CellUtil.matchingColumn(cell, METAFAMILY, REGION_EVENT)) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> return RegionEventDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> return null;<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Create a compaction WALEdit<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @param c<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @return A WALEdit that has <code>c</code> serialized as its value<a name="line.328"></a>
-<span class="sourceLineNo">329</span> */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> public static WALEdit createCompaction(final HRegionInfo hri, final CompactionDescriptor c) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> byte [] pbbytes = c.toByteArray();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, COMPACTION,<a name="line.332"></a>
-<span class="sourceLineNo">333</span> EnvironmentEdgeManager.currentTime(), pbbytes);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> return new WALEdit().add(kv); //replication scope null so that this won't be replicated<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> private static byte[] getRowForRegion(HRegionInfo hri) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> byte[] startKey = hri.getStartKey();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> if (startKey.length == 0) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> // empty row key is not allowed in mutations because it is both the start key and the end key<a name="line.340"></a>
-<span class="sourceLineNo">341</span> // we return the smallest byte[] that is bigger (in lex comparison) than byte[0].<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return new byte[] {0};<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return startKey;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Deserialized and returns a CompactionDescriptor is the KeyValue contains one.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * @param kv the key value<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @return deserialized CompactionDescriptor or null.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public static CompactionDescriptor getCompaction(Cell kv) throws IOException {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (CellUtil.matchingColumn(kv, METAFAMILY, COMPACTION)) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return CompactionDescriptor.parseFrom(CellUtil.cloneValue(kv));<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> return null;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * Create a bulk loader WALEdit<a name="line.360"></a>
-<span class="sourceLineNo">361</span> *<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @param hri The HRegionInfo for the region in which we are bulk loading<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @param bulkLoadDescriptor The descriptor for the Bulk Loader<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return The WALEdit for the BulkLoad<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> public static WALEdit createBulkLoadEvent(HRegionInfo hri,<a name="line.366"></a>
-<span class="sourceLineNo">367</span> WALProtos.BulkLoadDescriptor bulkLoadDescriptor) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> KeyValue kv = new KeyValue(getRowForRegion(hri),<a name="line.368"></a>
-<span class="sourceLineNo">369</span> METAFAMILY,<a name="line.369"></a>
-<span class="sourceLineNo">370</span> BULK_LOAD,<a name="line.370"></a>
-<span class="sourceLineNo">371</span> EnvironmentEdgeManager.currentTime(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span> bulkLoadDescriptor.toByteArray());<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return new WALEdit().add(kv);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> /**<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * Deserialized and returns a BulkLoadDescriptor from the passed in Cell<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @param cell the key value<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @return deserialized BulkLoadDescriptor or null.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> */<a name="line.380"></a>
-<span class="sourceLineNo">381</span> public static WALProtos.BulkLoadDescriptor getBulkLoadDescriptor(Cell cell) throws IOException {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> if (CellUtil.matchingColumn(cell, METAFAMILY, BULK_LOAD)) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> return WALProtos.BulkLoadDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span> return null;<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>}<a name="line.387"></a>
+<span class="sourceLineNo">304</span> public static WALEdit createFlushWALEdit(HRegionInfo hri, FlushDescriptor f) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, FLUSH,<a name="line.305"></a>
+<span class="sourceLineNo">306</span> EnvironmentEdgeManager.currentTime(), f.toByteArray());<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return new WALEdit().add(kv);<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> public static FlushDescriptor getFlushDescriptor(Cell cell) throws IOException {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> if (CellUtil.matchingColumn(cell, METAFAMILY, FLUSH)) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return FlushDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span> return null;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> public static WALEdit createRegionEventWALEdit(HRegionInfo hri,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> RegionEventDescriptor regionEventDesc) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, REGION_EVENT,<a name="line.319"></a>
+<span class="sourceLineNo">320</span> EnvironmentEdgeManager.currentTime(), regionEventDesc.toByteArray());<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return new WALEdit().add(kv);<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> public static RegionEventDescriptor getRegionEventDescriptor(Cell cell) throws IOException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> if (CellUtil.matchingColumn(cell, METAFAMILY, REGION_EVENT)) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> return RegionEventDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> return null;<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * Create a compaction WALEdit<a name="line.332"></a>
+<span class="sourceLineNo">333</span> * @param c<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * @return A WALEdit that has <code>c</code> serialized as its value<a name="line.334"></a>
+<span class="sourceLineNo">335</span> */<a name="line.335"></a>
+<span class="sourceLineNo">336</span> public static WALEdit createCompaction(final HRegionInfo hri, final CompactionDescriptor c) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> byte [] pbbytes = c.toByteArray();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, COMPACTION,<a name="line.338"></a>
+<span class="sourceLineNo">339</span> EnvironmentEdgeManager.currentTime(), pbbytes);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return new WALEdit().add(kv); //replication scope null so that this won't be replicated<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> private static byte[] getRowForRegion(HRegionInfo hri) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> byte[] startKey = hri.getStartKey();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> if (startKey.length == 0) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // empty row key is not allowed in mutations because it is both the start key and the end key<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // we return the smallest byte[] that is bigger (in lex comparison) than byte[0].<a name="line.347"></a>
+<span class="sourceLineNo">348</span> return new byte[] {0};<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span> return startKey;<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> /**<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * Deserialized and returns a CompactionDescriptor is the KeyValue contains one.<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * @param kv the key value<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return deserialized CompactionDescriptor or null.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public static CompactionDescriptor getCompaction(Cell kv) throws IOException {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (CellUtil.matchingColumn(kv, METAFAMILY, COMPACTION)) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return CompactionDescriptor.parseFrom(CellUtil.cloneValue(kv));<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> return null;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<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> * Create a bulk loader WALEdit<a name="line.366"></a>
+<span class="sourceLineNo">367</span> *<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * @param hri The HRegionInfo for the region in which we are bulk loading<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * @param bulkLoadDescriptor The descriptor for the Bulk Loader<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * @return The WALEdit for the BulkLoad<a name="line.370"></a>
+<span class="sourceLineNo">371</span> */<a name="line.371"></a>
+<span class="sourceLineNo">372</span> public static WALEdit createBulkLoadEvent(HRegionInfo hri,<a name="line.372"></a>
+<span class="sourceLineNo">373</span> WALProtos.BulkLoadDescriptor bulkLoadDescriptor) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> KeyValue kv = new KeyValue(getRowForRegion(hri),<a name="line.374"></a>
+<span class="sourceLineNo">375</span> METAFAMILY,<a name="line.375"></a>
+<span class="sourceLineNo">376</span> BULK_LOAD,<a name="line.376"></a>
+<span class="sourceLineNo">377</span> EnvironmentEdgeManager.currentTime(),<a name="line.377"></a>
+<span class="sourceLineNo">378</span> bulkLoadDescriptor.toByteArray());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return new WALEdit().add(kv);<a name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * Deserialized and returns a BulkLoadDescriptor from the passed in Cell<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @param cell the key value<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * @return deserialized BulkLoadDescriptor or null.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> */<a name="line.386"></a>
+<span class="sourceLineNo">387</span> public static WALProtos.BulkLoadDescriptor getBulkLoadDescriptor(Cell cell) throws IOException {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (CellUtil.matchingColumn(cell, METAFAMILY, BULK_LOAD)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> return WALProtos.BulkLoadDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> return null;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>}<a name="line.393"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1b9384b2/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index d8b7655..385118d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -68,14 +68,14 @@
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.68"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -133,108 +133,108 @@
<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 27, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setFormat(String format)<a name="line.129"></a>
+<span class="sourceLineNo">128</span> // 29, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 27, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_format = format;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_format__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 29, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_assignmentManager = assignmentManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_assignmentManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public String getFormat()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public AssignmentManager getAssignmentManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_format;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_assignmentManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private String m_format;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getFormat__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private AssignmentManager m_assignmentManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_format__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_assignmentManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_format__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> // 26, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public void setFilter(String filter)<a name="line.146"></a>
+<span class="sourceLineNo">144</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // 26, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span> m_filter = filter;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> m_filter__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span> // 21, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span> m_frags = frags;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> m_frags__IsNotDefault = true;<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public String getFilter()<a name="line.152"></a>
+<span class="sourceLineNo">152</span> public Map<String,Integer> getFrags()<a name="line.152"></a>
<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return m_filter;<a name="line.154"></a>
+<span class="sourceLineNo">154</span> return m_frags;<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span> private String m_filter;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public boolean getFilter__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span> private Map<String,Integer> m_frags;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public boolean getFrags__IsNotDefault()<a name="line.157"></a>
<span class="sourceLineNo">158</span> {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> return m_filter__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span> private boolean m_filter__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 28, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setServerManager(ServerManager serverManager)<a name="line.163"></a>
+<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // 27, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setFormat(String format)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 28, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_serverManager = serverManager;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_serverManager__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 27, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_format = format;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_format__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public ServerManager getServerManager()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public String getFormat()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_serverManager;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_format;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private ServerManager m_serverManager;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getServerManager__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private String m_format;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getFormat__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_serverManager__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_format__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_serverManager__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // 21, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void setFrags(Map<String,Integer> frags)<a name="line.180"></a>
+<span class="sourceLineNo">178</span> private boolean m_format__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // 25, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // 21, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span> m_frags = frags;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> m_frags__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span> // 25, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public Map<String,Integer> getFrags()<a name="line.186"></a>
+<span class="sourceLineNo">186</span> public boolean getCatalogJanitorEnabled()<a name="line.186"></a>
<span class="sourceLineNo">187</span> {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return m_frags;<a name="line.188"></a>
+<span class="sourceLineNo">188</span> return m_catalogJanitorEnabled;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> private Map<String,Integer> m_frags;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public boolean getFrags__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span> private boolean m_catalogJanitorEnabled;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.191"></a>
<span class="sourceLineNo">192</span> {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return m_frags__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> private boolean m_frags__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 29, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.197"></a>
+<span class="sourceLineNo">195</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // 23, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setServers(List<ServerName> servers)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 29, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_assignmentManager = assignmentManager;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_assignmentManager__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 23, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_servers = servers;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_servers__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public AssignmentManager getAssignmentManager()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public List<ServerName> getServers()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_assignmentManager;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_servers;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private AssignmentManager m_assignmentManager;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private List<ServerName> m_servers;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getServers__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_assignmentManager__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_servers__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 25, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_servers__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 25, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public boolean getCatalogJanitorEnabled()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_catalogJanitorEnabled;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private boolean m_catalogJanitorEnabled;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
@@ -252,23 +252,23 @@
<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
+<span class="sourceLineNo">247</span> // 28, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServerManager(ServerManager serverManager)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 28, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_serverManager = serverManager;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_serverManager__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public ServerManager getServerManager()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_serverManager;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private ServerManager m_serverManager;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServerManager__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_serverManager__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_serverManager__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -287,45 +287,45 @@
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected String format;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected AssignmentManager assignmentManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setFormat(p_format);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<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> protected String filter;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.290"></a>
+<span class="sourceLineNo">289</span> protected Map<String,Integer> frags;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map<String,Integer> p_frags)<a name="line.290"></a>
<span class="sourceLineNo">291</span> {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> (getImplData()).setFilter(p_filter);<a name="line.292"></a>
+<span class="sourceLineNo">292</span> (getImplData()).setFrags(p_frags);<a name="line.292"></a>
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected ServerManager serverManager;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected String format;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setServerManager(p_serverManager);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setFormat(p_format);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
-<span class="sourceLineNo">303</span> protected Map<String,Integer> frags;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map<String,Integer> p_frags)<a name="line.304"></a>
+<span class="sourceLineNo">303</span> protected boolean catalogJanitorEnabled;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> (getImplData()).setFrags(p_frags);<a name="line.306"></a>
+<span class="sourceLineNo">306</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.306"></a>
<span class="sourceLineNo">307</span> return this;<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> protected AssignmentManager assignmentManager;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected List<ServerName> servers;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setServers(p_servers);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected boolean catalogJanitorEnabled;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<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>
@@ -336,10 +336,10 @@
<span class="sourceLineNo">328</span> return this;<a name="line.328"></a>
<span class="sourceLineNo">329</span> }<a name="line.329"></a>
<span class="sourceLineNo">330</span> <a name="line.330"></a>
-<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected ServerManager serverManager;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServerManager(p_serverManager);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<a name="line.335"></a>
<span class="sourceLineNo">336</span> }<a name="line.336"></a>
<span class="sourceLineNo">337</span> <a name="line.337"></a>