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/09/13 14:53:56 UTC
[12/19] hbase-site git commit: Published site at
5d14c1af65c02f4e87059337c35e4431505de91c.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/836bc028/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.EntryIterator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.EntryIterator.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.EntryIterator.html
index ba63645..6253d3f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.EntryIterator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.EntryIterator.html
@@ -148,725 +148,728 @@
<span class="sourceLineNo">140</span> LOG.info("Rebuilding tracker for " + log);<a name="line.140"></a>
<span class="sourceLineNo">141</span> }<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> FSDataInputStream stream = log.getStream();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> boolean hasMore = true;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> while (hasMore) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> ProcedureWALEntry entry = ProcedureWALFormat.readEntry(stream);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> if (entry == null) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> LOG.warn("Nothing left to decode. Exiting with missing EOF, log=" + log);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> break;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> switch (entry.getType()) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> case PROCEDURE_WAL_INIT:<a name="line.153"></a>
-<span class="sourceLineNo">154</span> readInitEntry(entry);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> break;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> case PROCEDURE_WAL_INSERT:<a name="line.156"></a>
-<span class="sourceLineNo">157</span> readInsertEntry(entry);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> break;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> case PROCEDURE_WAL_UPDATE:<a name="line.159"></a>
-<span class="sourceLineNo">160</span> case PROCEDURE_WAL_COMPACT:<a name="line.160"></a>
-<span class="sourceLineNo">161</span> readUpdateEntry(entry);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> break;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> case PROCEDURE_WAL_DELETE:<a name="line.163"></a>
-<span class="sourceLineNo">164</span> readDeleteEntry(entry);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> break;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> case PROCEDURE_WAL_EOF:<a name="line.166"></a>
-<span class="sourceLineNo">167</span> hasMore = false;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> break;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> default:<a name="line.169"></a>
-<span class="sourceLineNo">170</span> throw new CorruptedWALProcedureStoreException("Invalid entry: " + entry);<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> } catch (InvalidProtocolBufferException e) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.error("While reading procedure from " + log, e);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> loader.markCorruptedWAL(log, e);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (localTracker != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> localTracker.setPartialFlag(false);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (!localProcedureMap.isEmpty()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> log.setProcIds(localProcedureMap.getMinProcId(), localProcedureMap.getMaxProcId());<a name="line.182"></a>
-<span class="sourceLineNo">183</span> procedureMap.mergeTail(localProcedureMap);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> //if (hasFastStartSupport) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> // TODO: Some procedure may be already runnables (see readInitEntry())<a name="line.186"></a>
-<span class="sourceLineNo">187</span> // (we can also check the "update map" in the log trackers)<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // --------------------------------------------------<a name="line.188"></a>
-<span class="sourceLineNo">189</span> //EntryIterator iter = procedureMap.fetchReady();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> //if (iter != null) loader.load(iter);<a name="line.190"></a>
+<span class="sourceLineNo">143</span> long count = 0;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> FSDataInputStream stream = log.getStream();<a name="line.144"></a>
+<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> boolean hasMore = true;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> while (hasMore) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> ProcedureWALEntry entry = ProcedureWALFormat.readEntry(stream);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (entry == null) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> LOG.warn("Nothing left to decode. Exiting with missing EOF, log=" + log);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> break;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> count++;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> switch (entry.getType()) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> case PROCEDURE_WAL_INIT:<a name="line.155"></a>
+<span class="sourceLineNo">156</span> readInitEntry(entry);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> break;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> case PROCEDURE_WAL_INSERT:<a name="line.158"></a>
+<span class="sourceLineNo">159</span> readInsertEntry(entry);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> break;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> case PROCEDURE_WAL_UPDATE:<a name="line.161"></a>
+<span class="sourceLineNo">162</span> case PROCEDURE_WAL_COMPACT:<a name="line.162"></a>
+<span class="sourceLineNo">163</span> readUpdateEntry(entry);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> break;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> case PROCEDURE_WAL_DELETE:<a name="line.165"></a>
+<span class="sourceLineNo">166</span> readDeleteEntry(entry);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> break;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> case PROCEDURE_WAL_EOF:<a name="line.168"></a>
+<span class="sourceLineNo">169</span> hasMore = false;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> break;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> default:<a name="line.171"></a>
+<span class="sourceLineNo">172</span> throw new CorruptedWALProcedureStoreException("Invalid entry: " + entry);<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> LOG.info("Read {} entries in {}", count, log);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> } catch (InvalidProtocolBufferException e) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> LOG.error("While reading entry #{} in {}", count, log, e);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> loader.markCorruptedWAL(log, e);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (localTracker != null) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> localTracker.setPartialFlag(false);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!localProcedureMap.isEmpty()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> log.setProcIds(localProcedureMap.getMinProcId(), localProcedureMap.getMaxProcId());<a name="line.185"></a>
+<span class="sourceLineNo">186</span> procedureMap.mergeTail(localProcedureMap);<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> //if (hasFastStartSupport) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // TODO: Some procedure may be already runnables (see readInitEntry())<a name="line.189"></a>
+<span class="sourceLineNo">190</span> // (we can also check the "update map" in the log trackers)<a name="line.190"></a>
<span class="sourceLineNo">191</span> // --------------------------------------------------<a name="line.191"></a>
-<span class="sourceLineNo">192</span> //}<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> public void finish() throws IOException {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // notify the loader about the max proc ID<a name="line.197"></a>
-<span class="sourceLineNo">198</span> loader.setMaxProcId(maxProcId);<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> // fetch the procedure ready to run.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> ProcedureIterator procIter = procedureMap.fetchReady();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (procIter != null) loader.load(procIter);<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> // remaining procedures have missing link or dependencies<a name="line.204"></a>
-<span class="sourceLineNo">205</span> // consider them as corrupted, manual fix is probably required.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> procIter = procedureMap.fetchAll();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (procIter != null) loader.handleCorrupted(procIter);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> private void loadProcedure(final ProcedureWALEntry entry, final ProcedureProtos.Procedure proc) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> maxProcId = Math.max(maxProcId, proc.getProcId());<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (isRequired(proc.getProcId())) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> if (LOG.isTraceEnabled()) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> LOG.trace("Read " + entry.getType() + " entry " + proc.getProcId());<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span> localProcedureMap.add(proc);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> if (tracker.isPartial()) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> tracker.insert(proc.getProcId());<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> }<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (localTracker != null) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> localTracker.insert(proc.getProcId());<a name="line.222"></a>
+<span class="sourceLineNo">192</span> //EntryIterator iter = procedureMap.fetchReady();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> //if (iter != null) loader.load(iter);<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // --------------------------------------------------<a name="line.194"></a>
+<span class="sourceLineNo">195</span> //}<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> public void finish() throws IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> // notify the loader about the max proc ID<a name="line.200"></a>
+<span class="sourceLineNo">201</span> loader.setMaxProcId(maxProcId);<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> // fetch the procedure ready to run.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> ProcedureIterator procIter = procedureMap.fetchReady();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> if (procIter != null) loader.load(procIter);<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> // remaining procedures have missing link or dependencies<a name="line.207"></a>
+<span class="sourceLineNo">208</span> // consider them as corrupted, manual fix is probably required.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> procIter = procedureMap.fetchAll();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (procIter != null) loader.handleCorrupted(procIter);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> private void loadProcedure(final ProcedureWALEntry entry, final ProcedureProtos.Procedure proc) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> maxProcId = Math.max(maxProcId, proc.getProcId());<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (isRequired(proc.getProcId())) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (LOG.isTraceEnabled()) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> LOG.trace("Read " + entry.getType() + " entry " + proc.getProcId());<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> localProcedureMap.add(proc);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (tracker.isPartial()) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> tracker.insert(proc.getProcId());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> private void readInitEntry(final ProcedureWALEntry entry)<a name="line.226"></a>
-<span class="sourceLineNo">227</span> throws IOException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.228"></a>
-<span class="sourceLineNo">229</span> loadProcedure(entry, entry.getProcedure(0));<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> private void readInsertEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> assert entry.getProcedureCount() >= 1 : "Expected one or more procedures";<a name="line.233"></a>
-<span class="sourceLineNo">234</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.234"></a>
-<span class="sourceLineNo">235</span> for (int i = 1; i < entry.getProcedureCount(); ++i) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> loadProcedure(entry, entry.getProcedure(i));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> private void readUpdateEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.241"></a>
-<span class="sourceLineNo">242</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> private void readDeleteEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assert entry.hasProcId() : "expected ProcID";<a name="line.246"></a>
+<span class="sourceLineNo">224</span> if (localTracker != null) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> localTracker.insert(proc.getProcId());<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private void readInitEntry(final ProcedureWALEntry entry)<a name="line.229"></a>
+<span class="sourceLineNo">230</span> throws IOException {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.231"></a>
+<span class="sourceLineNo">232</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> private void readInsertEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> assert entry.getProcedureCount() >= 1 : "Expected one or more procedures";<a name="line.236"></a>
+<span class="sourceLineNo">237</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.237"></a>
+<span class="sourceLineNo">238</span> for (int i = 1; i < entry.getProcedureCount(); ++i) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> loadProcedure(entry, entry.getProcedure(i));<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><a name="line.242"></a>
+<span class="sourceLineNo">243</span> private void readUpdateEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.244"></a>
+<span class="sourceLineNo">245</span> loadProcedure(entry, entry.getProcedure(0));<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 (entry.getChildIdCount() > 0) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.249"></a>
+<span class="sourceLineNo">248</span> private void readDeleteEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> assert entry.hasProcId() : "expected ProcID";<a name="line.249"></a>
<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> // update the parent procedure<a name="line.251"></a>
-<span class="sourceLineNo">252</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.252"></a>
+<span class="sourceLineNo">251</span> if (entry.getChildIdCount() > 0) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> assert entry.getProcedureCount() == 1 : "Expected only one procedure";<a name="line.252"></a>
<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span> // remove the child procedures of entry.getProcId()<a name="line.254"></a>
-<span class="sourceLineNo">255</span> for (int i = 0, count = entry.getChildIdCount(); i < count; ++i) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> deleteEntry(entry.getChildId(i));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> } else {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> assert entry.getProcedureCount() == 0 : "Expected no procedures";<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> // delete the procedure<a name="line.261"></a>
-<span class="sourceLineNo">262</span> deleteEntry(entry.getProcId());<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> private void deleteEntry(final long procId) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (LOG.isTraceEnabled()) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> LOG.trace("delete entry " + procId);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> maxProcId = Math.max(maxProcId, procId);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> localProcedureMap.remove(procId);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> assert !procedureMap.contains(procId);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (tracker.isPartial()) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> tracker.setDeleted(procId, true);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (localTracker != null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> // In case there is only delete entry for this procedure in current log.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> localTracker.setDeleted(procId, true);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<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> private boolean isDeleted(final long procId) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return tracker.isDeleted(procId) == ProcedureStoreTracker.DeleteState.YES;<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> private boolean isRequired(final long procId) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return !isDeleted(procId) && !procedureMap.contains(procId);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> // ==========================================================================<a name="line.290"></a>
-<span class="sourceLineNo">291</span> // We keep an in-memory map of the procedures sorted by replay order.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> // (see the details in the beginning of the file)<a name="line.292"></a>
-<span class="sourceLineNo">293</span> // _______________________________________________<a name="line.293"></a>
-<span class="sourceLineNo">294</span> // procedureMap = | A | | E | | C | | | | | G | | |<a name="line.294"></a>
-<span class="sourceLineNo">295</span> // D B<a name="line.295"></a>
-<span class="sourceLineNo">296</span> // replayOrderHead = C <-> B <-> E <-> D <-> A <-> G<a name="line.296"></a>
-<span class="sourceLineNo">297</span> //<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // We also have a lazy grouping by "root procedure", and a list of<a name="line.298"></a>
-<span class="sourceLineNo">299</span> // unlinked procedures. If after reading all the WALs we have unlinked<a name="line.299"></a>
-<span class="sourceLineNo">300</span> // procedures it means that we had a missing WAL or a corruption.<a name="line.300"></a>
-<span class="sourceLineNo">301</span> // rootHead = A <-> D <-> G<a name="line.301"></a>
-<span class="sourceLineNo">302</span> // B E<a name="line.302"></a>
-<span class="sourceLineNo">303</span> // C<a name="line.303"></a>
-<span class="sourceLineNo">304</span> // unlinkFromLinkList = None<a name="line.304"></a>
-<span class="sourceLineNo">305</span> // ==========================================================================<a name="line.305"></a>
-<span class="sourceLineNo">306</span> private static class Entry {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // For bucketed linked lists in hash-table.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> protected Entry hashNext;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> // child head<a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected Entry childHead;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // double-link for rootHead or childHead<a name="line.311"></a>
-<span class="sourceLineNo">312</span> protected Entry linkNext;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> protected Entry linkPrev;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> // replay double-linked-list<a name="line.314"></a>
-<span class="sourceLineNo">315</span> protected Entry replayNext;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> protected Entry replayPrev;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // procedure-infos<a name="line.317"></a>
-<span class="sourceLineNo">318</span> protected Procedure procedure;<a name="line.318"></a>
-<span class="sourceLineNo">319</span> protected ProcedureProtos.Procedure proto;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> protected boolean ready = false;<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public Entry(Entry hashNext) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> this.hashNext = hashNext;<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> public long getProcId() {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return proto.getProcId();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> public long getParentId() {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> return proto.getParentId();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> public boolean hasParent() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return proto.hasParentId();<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>
-<span class="sourceLineNo">338</span> public boolean isReady() {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> return ready;<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> public boolean isFinished() {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (!hasParent()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // we only consider 'root' procedures. because for the user 'finished'<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // means when everything up to the 'root' is finished.<a name="line.345"></a>
-<span class="sourceLineNo">346</span> switch (proto.getState()) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> case ROLLEDBACK:<a name="line.347"></a>
-<span class="sourceLineNo">348</span> case SUCCESS:<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return true;<a name="line.349"></a>
-<span class="sourceLineNo">350</span> default:<a name="line.350"></a>
-<span class="sourceLineNo">351</span> break;<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> return false;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> public Procedure convert() throws IOException {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (procedure == null) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> procedure = ProcedureUtil.convertToProcedure(proto);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> return procedure;<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> @Override<a name="line.364"></a>
-<span class="sourceLineNo">365</span> public String toString() {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> final StringBuilder sb = new StringBuilder();<a name="line.366"></a>
-<span class="sourceLineNo">367</span> sb.append("Entry(");<a name="line.367"></a>
-<span class="sourceLineNo">368</span> sb.append(getProcId());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> sb.append(", parentId=");<a name="line.369"></a>
-<span class="sourceLineNo">370</span> sb.append(getParentId());<a name="line.370"></a>
-<span class="sourceLineNo">371</span> sb.append(", class=");<a name="line.371"></a>
-<span class="sourceLineNo">372</span> sb.append(proto.getClassName());<a name="line.372"></a>
-<span class="sourceLineNo">373</span> sb.append(")");<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return sb.toString();<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><a name="line.377"></a>
-<span class="sourceLineNo">378</span> private static class EntryIterator implements ProcedureIterator {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> private final Entry replayHead;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> private Entry current;<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> public EntryIterator(Entry replayHead) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> this.replayHead = replayHead;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> this.current = replayHead;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span> public void reset() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> this.current = replayHead;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> @Override<a name="line.392"></a>
-<span class="sourceLineNo">393</span> public boolean hasNext() {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return current != null;<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span> public boolean isNextFinished() {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return current != null && current.isFinished();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> @Override<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public void skipNext() {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> current = current.replayNext;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> @Override<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public Procedure next() throws IOException {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return current.convert();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } finally {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> current = current.replayNext;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> private static class WalProcedureMap {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> // procedure hash table<a name="line.418"></a>
-<span class="sourceLineNo">419</span> private Entry[] procedureMap;<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> // replay-order double-linked-list<a name="line.421"></a>
-<span class="sourceLineNo">422</span> private Entry replayOrderHead;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> private Entry replayOrderTail;<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> // root linked-list<a name="line.425"></a>
-<span class="sourceLineNo">426</span> private Entry rootHead;<a name="line.426"></a>
+<span class="sourceLineNo">254</span> // update the parent procedure<a name="line.254"></a>
+<span class="sourceLineNo">255</span> loadProcedure(entry, entry.getProcedure(0));<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> // remove the child procedures of entry.getProcId()<a name="line.257"></a>
+<span class="sourceLineNo">258</span> for (int i = 0, count = entry.getChildIdCount(); i < count; ++i) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> deleteEntry(entry.getChildId(i));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> } else {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> assert entry.getProcedureCount() == 0 : "Expected no procedures";<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> // delete the procedure<a name="line.264"></a>
+<span class="sourceLineNo">265</span> deleteEntry(entry.getProcId());<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><a name="line.268"></a>
+<span class="sourceLineNo">269</span> private void deleteEntry(final long procId) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (LOG.isTraceEnabled()) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> LOG.trace("delete entry " + procId);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span> maxProcId = Math.max(maxProcId, procId);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> localProcedureMap.remove(procId);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> assert !procedureMap.contains(procId);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (tracker.isPartial()) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> tracker.setDeleted(procId, true);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (localTracker != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> // In case there is only delete entry for this procedure in current log.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> localTracker.setDeleted(procId, true);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> private boolean isDeleted(final long procId) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return tracker.isDeleted(procId) == ProcedureStoreTracker.DeleteState.YES;<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> private boolean isRequired(final long procId) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> return !isDeleted(procId) && !procedureMap.contains(procId);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> // ==========================================================================<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // We keep an in-memory map of the procedures sorted by replay order.<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // (see the details in the beginning of the file)<a name="line.295"></a>
+<span class="sourceLineNo">296</span> // _______________________________________________<a name="line.296"></a>
+<span class="sourceLineNo">297</span> // procedureMap = | A | | E | | C | | | | | G | | |<a name="line.297"></a>
+<span class="sourceLineNo">298</span> // D B<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // replayOrderHead = C <-> B <-> E <-> D <-> A <-> G<a name="line.299"></a>
+<span class="sourceLineNo">300</span> //<a name="line.300"></a>
+<span class="sourceLineNo">301</span> // We also have a lazy grouping by "root procedure", and a list of<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // unlinked procedures. If after reading all the WALs we have unlinked<a name="line.302"></a>
+<span class="sourceLineNo">303</span> // procedures it means that we had a missing WAL or a corruption.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> // rootHead = A <-> D <-> G<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // B E<a name="line.305"></a>
+<span class="sourceLineNo">306</span> // C<a name="line.306"></a>
+<span class="sourceLineNo">307</span> // unlinkFromLinkList = None<a name="line.307"></a>
+<span class="sourceLineNo">308</span> // ==========================================================================<a name="line.308"></a>
+<span class="sourceLineNo">309</span> private static class Entry {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> // For bucketed linked lists in hash-table.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> protected Entry hashNext;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // child head<a name="line.312"></a>
+<span class="sourceLineNo">313</span> protected Entry childHead;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // double-link for rootHead or childHead<a name="line.314"></a>
+<span class="sourceLineNo">315</span> protected Entry linkNext;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> protected Entry linkPrev;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // replay double-linked-list<a name="line.317"></a>
+<span class="sourceLineNo">318</span> protected Entry replayNext;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> protected Entry replayPrev;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> // procedure-infos<a name="line.320"></a>
+<span class="sourceLineNo">321</span> protected Procedure procedure;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> protected ProcedureProtos.Procedure proto;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> protected boolean ready = false;<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> public Entry(Entry hashNext) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> this.hashNext = hashNext;<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> public long getProcId() {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return proto.getProcId();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> public long getParentId() {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> return proto.getParentId();<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> public boolean hasParent() {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> return proto.hasParentId();<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> public boolean isReady() {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return ready;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> public boolean isFinished() {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (!hasParent()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // we only consider 'root' procedures. because for the user 'finished'<a name="line.347"></a>
+<span class="sourceLineNo">348</span> // means when everything up to the 'root' is finished.<a name="line.348"></a>
+<span class="sourceLineNo">349</span> switch (proto.getState()) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> case ROLLEDBACK:<a name="line.350"></a>
+<span class="sourceLineNo">351</span> case SUCCESS:<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return true;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> default:<a name="line.353"></a>
+<span class="sourceLineNo">354</span> break;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return false;<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> public Procedure convert() throws IOException {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> if (procedure == null) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> procedure = ProcedureUtil.convertToProcedure(proto);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return procedure;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public String toString() {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> final StringBuilder sb = new StringBuilder();<a name="line.369"></a>
+<span class="sourceLineNo">370</span> sb.append("Entry(");<a name="line.370"></a>
+<span class="sourceLineNo">371</span> sb.append(getProcId());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> sb.append(", parentId=");<a name="line.372"></a>
+<span class="sourceLineNo">373</span> sb.append(getParentId());<a name="line.373"></a>
+<span class="sourceLineNo">374</span> sb.append(", class=");<a name="line.374"></a>
+<span class="sourceLineNo">375</span> sb.append(proto.getClassName());<a name="line.375"></a>
+<span class="sourceLineNo">376</span> sb.append(")");<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return sb.toString();<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> private static class EntryIterator implements ProcedureIterator {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> private final Entry replayHead;<a name="line.382"></a>
+<span class="sourceLineNo">383</span> private Entry current;<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> public EntryIterator(Entry replayHead) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> this.replayHead = replayHead;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> this.current = replayHead;<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> @Override<a name="line.390"></a>
+<span class="sourceLineNo">391</span> public void reset() {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> this.current = replayHead;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> @Override<a name="line.395"></a>
+<span class="sourceLineNo">396</span> public boolean hasNext() {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> return current != null;<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span> @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span> public boolean isNextFinished() {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> return current != null && current.isFinished();<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> @Override<a name="line.405"></a>
+<span class="sourceLineNo">406</span> public void skipNext() {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> current = current.replayNext;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> @Override<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public Procedure next() throws IOException {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> try {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> return current.convert();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> } finally {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> current = current.replayNext;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> private static class WalProcedureMap {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> // procedure hash table<a name="line.421"></a>
+<span class="sourceLineNo">422</span> private Entry[] procedureMap;<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> // replay-order double-linked-list<a name="line.424"></a>
+<span class="sourceLineNo">425</span> private Entry replayOrderHead;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> private Entry replayOrderTail;<a name="line.426"></a>
<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> // pending unlinked children (root not present yet)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> private Entry childUnlinkedHead;<a name="line.429"></a>
+<span class="sourceLineNo">428</span> // root linked-list<a name="line.428"></a>
+<span class="sourceLineNo">429</span> private Entry rootHead;<a name="line.429"></a>
<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> // Track ProcId range<a name="line.431"></a>
-<span class="sourceLineNo">432</span> private long minProcId = Long.MAX_VALUE;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> private long maxProcId = Long.MIN_VALUE;<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span> public WalProcedureMap(int size) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> procedureMap = new Entry[size];<a name="line.436"></a>
-<span class="sourceLineNo">437</span> replayOrderHead = null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> replayOrderTail = null;<a name="line.438"></a>
-<span class="sourceLineNo">439</span> rootHead = null;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> childUnlinkedHead = null;<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> public void add(ProcedureProtos.Procedure procProto) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> trackProcIds(procProto.getProcId());<a name="line.444"></a>
-<span class="sourceLineNo">445</span> Entry entry = addToMap(procProto.getProcId(), procProto.hasParentId());<a name="line.445"></a>
-<span class="sourceLineNo">446</span> boolean newEntry = entry.proto == null;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> // We have seen procedure WALs where the entries are out of order; see HBASE-18152.<a name="line.447"></a>
-<span class="sourceLineNo">448</span> // To compensate, only replace the Entry procedure if for sure this new procedure<a name="line.448"></a>
-<span class="sourceLineNo">449</span> // is indeed an entry that came later. TODO: Fix the writing of procedure info so<a name="line.449"></a>
-<span class="sourceLineNo">450</span> // it does not violate basic expectation, that WALs contain procedure changes going<a name="line.450"></a>
-<span class="sourceLineNo">451</span> // from start to finish in sequence.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (newEntry || isIncreasing(entry.proto, procProto)) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> entry.proto = procProto;<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span> addToReplayList(entry);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> if(newEntry) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> if (procProto.hasParentId()) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> childUnlinkedHead = addToLinkList(entry, childUnlinkedHead);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> } else {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> rootHead = addToLinkList(entry, rootHead);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @return True if this new procedure is 'richer' than the current one else<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * false and we log this incidence where it appears that the WAL has older entries<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * appended after newer ones. See HBASE-18152.<a name="line.468"></a>
-<span class="sourceLineNo">469</span> */<a name="line.469"></a>
-<span class="sourceLineNo">470</span> private static boolean isIncreasing(ProcedureProtos.Procedure current,<a name="line.470"></a>
-<span class="sourceLineNo">471</span> ProcedureProtos.Procedure candidate) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> // Check that the procedures we see are 'increasing'. We used to compare<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // procedure id first and then update time but it can legitimately go backwards if the<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // procedure is failed or rolled back so that was unreliable. Was going to compare<a name="line.474"></a>
-<span class="sourceLineNo">475</span> // state but lets see if comparing update time enough (unfortunately this issue only<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // seen under load...)<a name="line.476"></a>
-<span class="sourceLineNo">477</span> boolean increasing = current.getLastUpdate() <= candidate.getLastUpdate();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> if (!increasing) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> return increasing;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> public boolean remove(long procId) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> trackProcIds(procId);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> Entry entry = removeFromMap(procId);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> if (entry != null) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> unlinkFromReplayList(entry);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> unlinkFromLinkList(entry);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return true;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return false;<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> private void trackProcIds(long procId) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> minProcId = Math.min(minProcId, procId);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> maxProcId = Math.max(maxProcId, procId);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> public long getMinProcId() {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> return minProcId;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> public long getMaxProcId() {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> return maxProcId;<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> public boolean contains(long procId) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> return getProcedure(procId) != null;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> public boolean isEmpty() {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> return replayOrderHead == null;<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> public void clear() {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> for (int i = 0; i < procedureMap.length; ++i) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> procedureMap[i] = null;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> replayOrderHead = null;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> replayOrderTail = null;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> rootHead = null;<a name="line.522"></a>
-<span class="sourceLineNo">523</span> childUnlinkedHead = null;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> minProcId = Long.MAX_VALUE;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> maxProcId = Long.MIN_VALUE;<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /*<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Merges two WalProcedureMap,<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * the target is the "global" map, the source is the "local" map.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * - The entries in the hashtables are guaranteed to be unique.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * On replay we don't load procedures that already exist in the "global"<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * map (the one we are merging the "local" in to).<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * - The replayOrderList of the "local" nao will be appended to the "global"<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * map replay list.<a name="line.535"></a>
-<span class="sourceLineNo">536</span> * - The "local" map will be cleared at the end of the operation.<a name="line.536"></a>
-<span class="sourceLineNo">537</span> */<a name="line.537"></a>
-<span class="sourceLineNo">538</span> public void mergeTail(WalProcedureMap other) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> for (Entry p = other.replayOrderHead; p != null; p = p.replayNext) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> int slotIndex = getMapSlot(p.getProcId());<a name="line.540"></a>
-<span class="sourceLineNo">541</span> p.hashNext = procedureMap[slotIndex];<a name="line.541"></a>
-<span class="sourceLineNo">542</span> procedureMap[slotIndex] = p;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> if (replayOrderHead == null) {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> replayOrderHead = other.replayOrderHead;<a name="line.546"></a>
-<span class="sourceLineNo">547</span> replayOrderTail = other.replayOrderTail;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> rootHead = other.rootHead;<a name="line.548"></a>
-<span class="sourceLineNo">549</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> } else {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> // append replay list<a name="line.551"></a>
-<span class="sourceLineNo">552</span> assert replayOrderTail.replayNext == null;<a name="line.552"></a>
-<span class="sourceLineNo">553</span> assert other.replayOrderHead.replayPrev == null;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> replayOrderTail.replayNext = other.replayOrderHead;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> other.replayOrderHead.replayPrev = replayOrderTail;<a name="line.555"></a>
-<span class="sourceLineNo">556</span> replayOrderTail = other.replayOrderTail;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> // merge rootHead<a name="line.558"></a>
-<span class="sourceLineNo">559</span> if (rootHead == null) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> rootHead = other.rootHead;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else if (other.rootHead != null) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> Entry otherTail = findLinkListTail(other.rootHead);<a name="line.562"></a>
-<span class="sourceLineNo">563</span> otherTail.linkNext = rootHead;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> rootHead.linkPrev = otherTail;<a name="line.564"></a>
-<span class="sourceLineNo">565</span> rootHead = other.rootHead;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span> // merge childUnlinkedHead<a name="line.568"></a>
-<span class="sourceLineNo">569</span> if (childUnlinkedHead == null) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> } else if (other.childUnlinkedHead != null) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span> Entry otherTail = findLinkListTail(other.childUnlinkedHead);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> otherTail.linkNext = childUnlinkedHead;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> childUnlinkedHead.linkPrev = otherTail;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span> }<a name="line.577"></a>
-<span class="sourceLineNo">578</span> maxProcId = Math.max(maxProcId, other.maxProcId);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> minProcId = Math.max(minProcId, other.minProcId);<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span> other.clear();<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">431</span> // pending unlinked children (root not present yet)<a name="line.431"></a>
+<span class="sourceLineNo">432</span> private Entry childUnlinkedHead;<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // Track ProcId range<a name="line.434"></a>
+<span class="sourceLineNo">435</span> private long minProcId = Long.MAX_VALUE;<a name="line.435"></a>
+<span class="sourceLineNo">436</span> private long maxProcId = Long.MIN_VALUE;<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span> public WalProcedureMap(int size) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> procedureMap = new Entry[size];<a name="line.439"></a>
+<span class="sourceLineNo">440</span> replayOrderHead = null;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> replayOrderTail = null;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> rootHead = null;<a name="line.442"></a>
+<span class="sourceLineNo">443</span> childUnlinkedHead = null;<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> public void add(ProcedureProtos.Procedure procProto) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> trackProcIds(procProto.getProcId());<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Entry entry = addToMap(procProto.getProcId(), procProto.hasParentId());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> boolean newEntry = entry.proto == null;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> // We have seen procedure WALs where the entries are out of order; see HBASE-18152.<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // To compensate, only replace the Entry procedure if for sure this new procedure<a name="line.451"></a>
+<span class="sourceLineNo">452</span> // is indeed an entry that came later. TODO: Fix the writing of procedure info so<a name="line.452"></a>
+<span class="sourceLineNo">453</span> // it does not violate basic expectation, that WALs contain procedure changes going<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // from start to finish in sequence.<a name="line.454"></a>
+<span class="sourceLineNo">455</span> if (newEntry || isIncreasing(entry.proto, procProto)) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> entry.proto = procProto;<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> addToReplayList(entry);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if(newEntry) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (procProto.hasParentId()) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> childUnlinkedHead = addToLinkList(entry, childUnlinkedHead);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> } else {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> rootHead = addToLinkList(entry, rootHead);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * @return True if this new procedure is 'richer' than the current one else<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * false and we log this incidence where it appears that the WAL has older entries<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * appended after newer ones. See HBASE-18152.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> */<a name="line.472"></a>
+<span class="sourceLineNo">473</span> private static boolean isIncreasing(ProcedureProtos.Procedure current,<a name="line.473"></a>
+<span class="sourceLineNo">474</span> ProcedureProtos.Procedure candidate) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> // Check that the procedures we see are 'increasing'. We used to compare<a name="line.475"></a>
+<span class="sourceLineNo">476</span> // procedure id first and then update time but it can legitimately go backwards if the<a name="line.476"></a>
+<span class="sourceLineNo">477</span> // procedure is failed or rolled back so that was unreliable. Was going to compare<a name="line.477"></a>
+<span class="sourceLineNo">478</span> // state but lets see if comparing update time enough (unfortunately this issue only<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // seen under load...)<a name="line.479"></a>
+<span class="sourceLineNo">480</span> boolean increasing = current.getLastUpdate() <= candidate.getLastUpdate();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (!increasing) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return increasing;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> public boolean remove(long procId) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span> trackProcIds(procId);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> Entry entry = removeFromMap(procId);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (entry != null) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> unlinkFromReplayList(entry);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> unlinkFromLinkList(entry);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> return true;<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span> return false;<a name="line.495"></a>
+<span class="sourceLineNo">496</span> }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> private void trackProcIds(long procId) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> minProcId = Math.min(minProcId, procId);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> maxProcId = Math.max(maxProcId, procId);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> public long getMinProcId() {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> return minProcId;<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> public long getMaxProcId() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return maxProcId;<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> public boolean contains(long procId) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> return getProcedure(procId) != null;<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> public boolean isEmpty() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> return replayOrderHead == null;<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span> public void clear() {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> for (int i = 0; i < procedureMap.length; ++i) {<a name="line.520"></a>
+<span class="sourceLineNo">521</span> procedureMap[i] = null;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span> replayOrderHead = null;<a name="line.523"></a>
+<span class="sourceLineNo">524</span> replayOrderTail = null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> rootHead = null;<a name="line.525"></a>
+<span class="sourceLineNo">526</span> childUnlinkedHead = null;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> minProcId = Long.MAX_VALUE;<a name="line.527"></a>
+<span class="sourceLineNo">528</span> maxProcId = Long.MIN_VALUE;<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /*<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Merges two WalProcedureMap,<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * the target is the "global" map, the source is the "local" map.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * - The entries in the hashtables are guaranteed to be unique.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> * On replay we don't load procedures that already exist in the "global"<a name="line.535"></a>
+<span class="sourceLineNo">536</span> * map (the one we are merging the "local" in to).<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * - The replayOrderList of the "local" nao will be appended to the "global"<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * map replay list.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> * - The "local" map will be cleared at the end of the operation.<a name="line.539"></a>
+<span class="sourceLineNo">540</span> */<a name="line.540"></a>
+<span class="sourceLineNo">541</span> public void mergeTail(WalProcedureMap other) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> for (Entry p = other.replayOrderHead; p != null; p = p.replayNext) {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> int slotIndex = getMapSlot(p.getProcId());<a name="line.543"></a>
+<span class="sourceLineNo">544</span> p.hashNext = procedureMap[slotIndex];<a name="line.544"></a>
+<span class="sourceLineNo">545</span> procedureMap[slotIndex] = p;<a name="line.545"></a>
+<span class="sourceLineNo">546</span> }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span> if (replayOrderHead == null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> replayOrderHead = other.replayOrderHead;<a name="line.549"></a>
+<span class="sourceLineNo">550</span> replayOrderTail = other.replayOrderTail;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> rootHead = other.rootHead;<a name="line.551"></a>
+<span class="sourceLineNo">552</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.552"></a>
+<span class="sourceLineNo">553</span> } else {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> // append replay list<a name="line.554"></a>
+<span class="sourceLineNo">555</span> assert replayOrderTail.replayNext == null;<a name="line.555"></a>
+<span class="sourceLineNo">556</span> assert other.replayOrderHead.replayPrev == null;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> replayOrderTail.replayNext = other.replayOrderHead;<a name="line.557"></a>
+<span class="sourceLineNo">558</span> other.replayOrderHead.replayPrev = replayOrderTail;<a name="line.558"></a>
+<span class="sourceLineNo">559</span> replayOrderTail = other.replayOrderTail;<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> // merge rootHead<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (rootHead == null) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> rootHead = other.rootHead;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } else if (other.rootHead != null) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> Entry otherTail = findLinkListTail(other.rootHead);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> otherTail.linkNext = rootHead;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> rootHead.linkPrev = otherTail;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> rootHead = other.rootHead;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> }<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span> // merge childUnlinkedHead<a name="line.571"></a>
+<span class="sourceLineNo">572</span> if (childUnlinkedHead == null) {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.573"></a>
+<span class="sourceLineNo">574</span> } else if (other.childUnlinkedHead != null) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Entry otherTail = findLinkListTail(other.childUnlinkedHead);<a name="line.575"></a>
+<span class="sourceLineNo">576</span> otherTail.linkNext = childUnlinkedHead;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> childUnlinkedHead.linkPrev = otherTail;<a name="line.577"></a>
+<span class="sourceLineNo">578</span> childUnlinkedHead = other.childUnlinkedHead;<a name="line.578"></a>
+<span class="sourceLineNo">579</span> }<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> maxProcId = Math.max(maxProcId, other.maxProcId);<a name="line.581"></a>
+<span class="sourceLineNo">582</span> minProcId = Math.max(minProcId, other.minProcId);<a name="line.582"></a>
<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> /*<a name="line.584"></a>
-<span class="sourceLineNo">585</span> * Returns an EntryIterator with the list of procedures ready<a name="line.585"></a>
-<span class="sourceLineNo">586</span> * to be added to the executor.<a name="line.586"></a>
-<span class="sourceLineNo">587</span> * A Procedure is ready if its children and parent are ready.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> */<a name="line.588"></a>
-<span class="sourceLineNo">589</span> public EntryIterator fetchReady() {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> buildGraph();<a name="line.590"></a>
-<span class="sourceLineNo">591</span><a name="line.591"></a>
-<span class="sourceLineNo">592</span> Entry readyHead = null;<a name="line.592"></a>
-<span class="sourceLineNo">593</span> Entry readyTail = null;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> Entry p = replayOrderHead;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> while (p != null) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> Entry next = p.replayNext;<a name="line.596"></a>
-<span class="sourceLineNo">597</span> if (p.isReady()) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> unlinkFromReplayList(p);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> if (readyTail != null) {<a name="line.599"></a>
-<span class="sourceLineNo">600</span> readyTail.replayNext = p;<a name="line.600"></a>
-<span class="sourceLineNo">601</span> p.replayPrev = readyTail;<a name="line.601"></a>
-<span class="sourceLineNo">602</span> } else {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> p.replayPrev = null;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> readyHead = p;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> readyTail = p;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> p.replayNext = null;<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span> p = next;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> }<a name="line.610"></a>
-<span class="sourceLineNo">611</span> // we need the hash-table lookups for parents, so this must be done<a name="line.611"></a>
-<span class="sourceLineNo">612</span> // out of the loop where we check isReadyToRun()<a name="line.612"></a>
-<span class="sourceLineNo">613</span> for (p = readyHead; p != null; p = p.replayNext) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> removeFromMap(p.getProcId());<a name="line.614"></a>
-<span class="sourceLineNo">615</span> unlinkFromLinkList(p);<a name="line.615"></a>
-<span class="sourceLineNo">616</span> }<a name="line.616"></a>
-<span class="sourceLineNo">617</span> return readyHead != null ? new EntryIterator(readyHead) : null;<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /*<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * Drain this map and return all procedures in it.<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public EntryIterator fetchAll() {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> Entry head = replayOrderHead;<a name="line.624"></a>
-<span class="sourceLineNo">625</span> for (Entry p = head; p != null; p = p.replayNext) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> removeFromMap(p.getProcId());<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> for (int i = 0; i < procedureMap.length; ++i) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span> assert procedureMap[i] == null : "map not empty i=" + i;<a name="line.629"></a>
+<span class="sourceLineNo">584</span> other.clear();<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span> /*<a name="line.587"></a>
+<span class="sourceLineNo">588</span> * Returns an EntryIterator with the list of procedures ready<a name="line.588"></a>
+<span class="sourceLineNo">589</span> * to be added to the executor.<a name="line.589"></a>
+<span class="sourceLineNo">590</span> * A Procedure is ready if its children and parent are ready.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> */<a name="line.591"></a>
+<span class="sourceLineNo">592</span> public EntryIterator fetchReady() {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> buildGraph();<a name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span> Entry readyHead = null;<a name="line.595"></a>
+<span class="sourceLineNo">596</span> Entry readyTail = null;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> Entry p = replayOrderHead;<a name="line.597"></a>
+<span class="sourceLineNo">598</span> while (p != null) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span> Entry next = p.replayNext;<a name="line.599"></a>
+<span class="sourceLineNo">600</span> if (p.isReady()) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> unlinkFromReplayList(p);<a name="line.601"></a>
+<span class="sourceLineNo">602</span> if (readyTail != null) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> readyTail.replayNext = p;<a name="line.603"></a>
+<span class="sourceLineNo">604</span> p.replayPrev = readyTail;<a name="line.604"></a>
+<span class="sourceLineNo">605</span> } else {<a name="line.605"></a>
+<span class="sourceLineNo">606</span> p.replay
<TRUNCATED>