http://git-wip-us.apache.org/repos/asf/hbase-site/blob/425db230/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureMap.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureMap.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureMap.html
index a281f12..d4b3978 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureMap.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureMap.html
@@ -25,594 +25,119 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.procedure2.store.wal;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.procedure2.ProcedureUtil;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.procedure2.store.ProcedureStore.ProcedureIterator;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.slf4j.Logger;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.slf4j.LoggerFactory;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * We keep an in-memory map of the 
procedures sorted by replay order. (see the details in the<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * beginning of {@link 
ProcedureWALFormatReader}).<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * &lt;pre&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *      procedureMap = | A |   | E |   | 
C |   |   |   |   | G |   |   |<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *                       D               
B<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *      replayOrderHead = C &lt;-&gt; B 
&lt;-&gt; E &lt;-&gt; D &lt;-&gt; A &lt;-&gt; G<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *  We also have a lazy grouping by "root 
procedure", and a list of<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *  unlinked procedures. If after reading 
all the WALs we have unlinked<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *  procedures it means that we had a 
missing WAL or a corruption.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *      rootHead = A &lt;-&gt; D 
&lt;-&gt; G<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *                 B     E<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span> *                 C<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *      unlinkFromLinkList = None<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span> * &lt;/pre&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>class WALProcedureMap {<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  private static final Logger LOG = 
LoggerFactory.getLogger(WALProcedureMap.class);<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>  private static class Entry {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>    // For bucketed linked lists in 
hash-table.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    private Entry hashNext;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    // child head<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    private Entry childHead;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    // double-link for rootHead or 
childHead<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    private Entry linkNext;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>    private Entry linkPrev;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    // replay double-linked-list<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>    private Entry replayNext;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    private Entry replayPrev;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    // procedure-infos<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>    private Procedure&lt;?&gt; 
procedure;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    private ProcedureProtos.Procedure 
proto;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    private boolean ready = false;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>    public Entry(Entry hashNext) {<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>      this.hashNext = hashNext;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public long getProcId() {<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>      return proto.getProcId();<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>    }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>    public long getParentId() {<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>      return proto.getParentId();<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public boolean hasParent() {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>      return proto.hasParentId();<a 
name="line.80"></a>
+<span class="sourceLineNo">020</span>import java.util.Collection;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.Collections;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.HashMap;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.Map;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.slf4j.Logger;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.slf4j.LoggerFactory;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * This class is used to track the active 
procedures when loading procedures from proc wal file.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * &lt;p/&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * We will read proc wal files from new 
to old, but when reading a proc wal file, we will still read<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span> * from top to bottom, so there are two 
groups of methods for this class.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;p/&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * The first group is {@link 
#add(ProcedureProtos.Procedure)} and {@link #remove(long)}. It is used<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span> * when reading a proc wal file. In these 
methods, for the same procedure, typically the one comes<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * later should win, please see the 
comment for<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * {@link 
#isIncreasing(ProcedureProtos.Procedure, ProcedureProtos.Procedure)} to see 
the<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * exceptions.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * &lt;p/&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * The second group is {@link 
#merge(WALProcedureMap)}. We will have a global<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * {@link WALProcedureMap} to hold global 
the active procedures, and a local {@link WALProcedureMap}<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * to hold the active procedures for the 
current proc wal file. And when we finish reading a proc<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * wal file, we will merge the local one 
into the global one, by calling the<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * {@link #merge(WALProcedureMap)} method 
of the global one and pass the local one in. In this<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * method, for the same procedure, the 
one comes earlier will win, as we read the proc wal files<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * from new to old(the reverse order).<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@InterfaceAudience.Private<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>class WALProcedureMap {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static final Logger LOG = 
LoggerFactory.getLogger(WALProcedureMap.class);<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  private final Map&lt;Long, 
ProcedureProtos.Procedure&gt; procMap = new HashMap&lt;&gt;();<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  private long minModifiedProcId = 
Long.MAX_VALUE;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private long maxModifiedProcId = 
Long.MIN_VALUE;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private void trackProcId(long procId) 
{<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    minModifiedProcId = 
Math.min(minModifiedProcId, procId);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    maxModifiedProcId = 
Math.max(maxModifiedProcId, procId);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @return True if this new procedure 
is 'richer' than the current one else false and we log this<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>   *         incidence where it appears 
that the WAL has older entries appended after newer ones.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   *         See HBASE-18152.<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private static boolean 
isIncreasing(ProcedureProtos.Procedure current,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      ProcedureProtos.Procedure 
candidate) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    // Check that the procedures we see 
are 'increasing'. We used to compare<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    // procedure id first and then update 
time but it can legitimately go backwards if the<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    // procedure is failed or rolled back 
so that was unreliable. Was going to compare<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    // state but lets see if comparing 
update time enough (unfortunately this issue only<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    // seen under load...)<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    boolean increasing = 
current.getLastUpdate() &lt;= candidate.getLastUpdate();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    if (!increasing) {<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      LOG.warn("NOT INCREASING! current=" 
+ current + ", candidate=" + candidate);<a name="line.80"></a>
 <span class="sourceLineNo">081</span>    }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>    public boolean isReady() {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      return ready;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    public boolean isFinished() {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      if (!hasParent()) {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>        // we only consider 'root' 
procedures. because for the user 'finished'<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        // means when everything up to 
the 'root' is finished.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        switch (proto.getState()) {<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>          case ROLLEDBACK:<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>          case SUCCESS:<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            return true;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>          default:<a name="line.95"></a>
-<span class="sourceLineNo">096</span>            break;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      }<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return false;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>    public Procedure&lt;?&gt; convert() 
throws IOException {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      if (procedure == null) {<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>        procedure = 
ProcedureUtil.convertToProcedure(proto);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      return procedure;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    public String toString() {<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>      final StringBuilder sb = new 
StringBuilder();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      sb.append("Entry(");<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      sb.append(getProcId());<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      sb.append(", parentId=");<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      sb.append(getParentId());<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      sb.append(", class=");<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      sb.append(proto.getClassName());<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      sb.append(")");<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>      return sb.toString();<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    }<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>  private static class EntryIterator 
implements ProcedureIterator {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    private final Entry replayHead;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    private Entry current;<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    public EntryIterator(Entry 
replayHead) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      this.replayHead = replayHead;<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      this.current = replayHead;<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    @Override<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    public void reset() {<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      this.current = replayHead;<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>    @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    public boolean hasNext() {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      return current != null;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    @Override<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    public boolean isNextFinished() {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      return current != null &amp;&amp; 
current.isFinished();<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>    @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    public void skipNext() {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      current = current.replayNext;<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>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public Procedure&lt;?&gt; next() 
throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      try {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        return current.convert();<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      } finally {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        current = current.replayNext;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  // procedure hash table<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>  private Entry[] procedureMap;<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  // replay-order double-linked-list<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>  private Entry replayOrderHead;<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>  private Entry replayOrderTail;<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>  // root linked-list<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>  private Entry rootHead;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>  // pending unlinked children (root not 
present yet)<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  private Entry childUnlinkedHead;<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>  // Track ProcId range<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>  private long minModifiedProcId = 
Long.MAX_VALUE;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private long maxModifiedProcId = 
Long.MIN_VALUE;<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public WALProcedureMap(int size) {<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    procedureMap = new Entry[size];<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>    replayOrderHead = null;<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>    replayOrderTail = null;<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    rootHead = null;<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>    childUnlinkedHead = null;<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>  public void 
add(ProcedureProtos.Procedure procProto) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    
trackProcIds(procProto.getProcId());<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    Entry entry = 
addToMap(procProto.getProcId(), procProto.hasParentId());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    boolean newEntry = entry.proto == 
null;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    // We have seen procedure WALs where 
the entries are out of order; see HBASE-18152.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    // To compensate, only replace the 
Entry procedure if for sure this new procedure<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    // is indeed an entry that came 
later.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    // TODO: Fix the writing of procedure 
info so it does not violate basic expectation, that WALs<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    // contain procedure changes 
goingfrom start to finish in sequence.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    if (newEntry || 
isIncreasing(entry.proto, procProto)) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      entry.proto = procProto;<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    addToReplayList(entry);<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    if (newEntry) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      if (procProto.hasParentId()) {<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>        childUnlinkedHead = 
addToLinkList(entry, childUnlinkedHead);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      } else {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        rootHead = addToLinkList(entry, 
rootHead);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * @return True if this new procedure 
is 'richer' than the current one else false and we log this<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>   *         incidence where it appears 
that the WAL has older entries appended after newer ones.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   *         See HBASE-18152.<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>   */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  private static boolean 
isIncreasing(ProcedureProtos.Procedure current,<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      ProcedureProtos.Procedure 
candidate) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    // Check that the procedures we see 
are 'increasing'. We used to compare<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    // procedure id first and then update 
time but it can legitimately go backwards if the<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    // procedure is failed or rolled back 
so that was unreliable. Was going to compare<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    // state but lets see if comparing 
update time enough (unfortunately this issue only<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    // seen under load...)<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>    boolean increasing = 
current.getLastUpdate() &lt;= candidate.getLastUpdate();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    if (!increasing) {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      LOG.warn("NOT INCREASING! current=" 
+ current + ", candidate=" + candidate);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    return increasing;<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public boolean remove(long procId) {<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>    trackProcIds(procId);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    Entry entry = 
removeFromMap(procId);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    if (entry != null) {<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>      unlinkFromReplayList(entry);<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>      unlinkFromLinkList(entry);<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>      return true;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    return false;<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>  private void trackProcIds(long procId) 
{<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    minModifiedProcId = 
Math.min(minModifiedProcId, procId);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    maxModifiedProcId = 
Math.max(maxModifiedProcId, procId);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>  public long getMinModifiedProcId() {<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>    return minModifiedProcId;<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>  public long getMaxModifiedProcId() {<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>    return maxModifiedProcId;<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>  public boolean contains(long procId) 
{<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    return getProcedure(procId) != 
null;<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  public boolean isEmpty() {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>    return replayOrderHead == null;<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>  public void clear() {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    for (int i = 0; i &lt; 
procedureMap.length; ++i) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      procedureMap[i] = null;<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    replayOrderHead = null;<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    replayOrderTail = null;<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>    rootHead = null;<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    childUnlinkedHead = null;<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>    minModifiedProcId = Long.MAX_VALUE;<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    maxModifiedProcId = Long.MIN_VALUE;<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>  /*<a name="line.272"></a>
-<span class="sourceLineNo">273</span>   * Merges two WalProcedureMap, the 
target is the "global" map, the source is the "local" map. -<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>   * The entries in the hashtables are 
guaranteed to be unique. On replay we don't load procedures<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>   * that already exist in the "global" 
map (the one we are merging the "local" in to). - The<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * replayOrderList of the "local" nao 
will be appended to the "global" map replay list. - The<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   * "local" map will be cleared at the 
end of the operation.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   */<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  public void mergeTail(WALProcedureMap 
other) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    for (Entry p = other.replayOrderHead; 
p != null; p = p.replayNext) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      int slotIndex = 
getMapSlot(p.getProcId());<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      p.hashNext = 
procedureMap[slotIndex];<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      procedureMap[slotIndex] = p;<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>    if (replayOrderHead == null) {<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>      replayOrderHead = 
other.replayOrderHead;<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      replayOrderTail = 
other.replayOrderTail;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      rootHead = other.rootHead;<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>      childUnlinkedHead = 
other.childUnlinkedHead;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    } else {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      // append replay list<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>      assert replayOrderTail.replayNext 
== null;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      assert 
other.replayOrderHead.replayPrev == null;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      replayOrderTail.replayNext = 
other.replayOrderHead;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      other.replayOrderHead.replayPrev = 
replayOrderTail;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      replayOrderTail = 
other.replayOrderTail;<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>      // merge rootHead<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>      if (rootHead == null) {<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>        rootHead = other.rootHead;<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>      } else if (other.rootHead != null) 
{<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        Entry otherTail = 
findLinkListTail(other.rootHead);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        otherTail.linkNext = rootHead;<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span>        rootHead.linkPrev = otherTail;<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>        rootHead = other.rootHead;<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>      }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>      // merge childUnlinkedHead<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>      if (childUnlinkedHead == null) {<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>        childUnlinkedHead = 
other.childUnlinkedHead;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      } else if (other.childUnlinkedHead 
!= null) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        Entry otherTail = 
findLinkListTail(other.childUnlinkedHead);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        otherTail.linkNext = 
childUnlinkedHead;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        childUnlinkedHead.linkPrev = 
otherTail;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        childUnlinkedHead = 
other.childUnlinkedHead;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    maxModifiedProcId = 
Math.max(maxModifiedProcId, other.maxModifiedProcId);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    minModifiedProcId = 
Math.max(minModifiedProcId, other.minModifiedProcId);<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>    other.clear();<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>   * Returns an EntryIterator with the 
list of procedures ready to be added to the executor. A<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   * Procedure is ready if its children 
and parent are ready.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  public ProcedureIterator fetchReady() 
{<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    buildGraph();<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>    Entry readyHead = null;<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>    Entry readyTail = null;<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>    Entry p = replayOrderHead;<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>    while (p != null) {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>      Entry next = p.replayNext;<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>      if (p.isReady()) {<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        unlinkFromReplayList(p);<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>        if (readyTail != null) {<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>          readyTail.replayNext = p;<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>          p.replayPrev = readyTail;<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>        } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>          p.replayPrev = null;<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>          readyHead = p;<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>        }<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        readyTail = p;<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>        p.replayNext = null;<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>      }<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      p = next;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    // we need the hash-table lookups for 
parents, so this must be done<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    // out of the loop where we check 
isReadyToRun()<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    for (p = readyHead; p != null; p = 
p.replayNext) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      removeFromMap(p.getProcId());<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>      unlinkFromLinkList(p);<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    return readyHead != null ? new 
EntryIterator(readyHead) : null;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>  /**<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * Drain this map and return all 
procedures in it.<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   */<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  public ProcedureIterator fetchAll() {<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>    Entry head = replayOrderHead;<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>    for (Entry p = head; p != null; p = 
p.replayNext) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      removeFromMap(p.getProcId());<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    for (int i = 0; i &lt; 
procedureMap.length; ++i) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      assert procedureMap[i] == null : 
"map not empty i=" + i;<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    }<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    replayOrderHead = null;<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    replayOrderTail = null;<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    childUnlinkedHead = null;<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>    rootHead = null;<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>    return head != null ? new 
EntryIterator(head) : null;<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 void buildGraph() {<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>    Entry p = childUnlinkedHead;<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    while (p != null) {<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>      Entry next = p.linkNext;<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>      Entry rootProc = 
getRootProcedure(p);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      if (rootProc != null) {<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>        rootProc.childHead = 
addToLinkList(p, rootProc.childHead);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      p = next;<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    for (p = rootHead; p != null; p = 
p.linkNext) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      checkReadyToRun(p);<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>  private Entry getRootProcedure(Entry 
entry) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    while (entry != null &amp;&amp; 
entry.hasParent()) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      entry = 
getProcedure(entry.getParentId());<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    return entry;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span>  /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   * (see the comprehensive explanation 
in the beginning of {@link ProcedureWALFormatReader}). A<a name="line.402"></a>
-<span class="sourceLineNo">403</span>   * Procedure is ready when parent and 
children are ready. "ready" means that we all the<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   * information that we need 
in-memory.<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   * &lt;p/&gt;<a name="line.405"></a>
-<span class="sourceLineNo">406</span>   * Example-1:&lt;br/&gt;<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>   * We have two WALs, we start reading 
from the newest (wal-2)<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   *<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   * &lt;pre&gt;<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   *    wal-2 | C B |<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>   *    wal-1 | A B C |<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>   * &lt;/pre&gt;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   *<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * If C and B don't depend on A (A is 
not the parent), we can start them before reading wal-1. If<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span>   * B is the only one with parent A we 
can start C. We have to read one more WAL before being able<a 
name="line.415"></a>
-<span class="sourceLineNo">416</span>   * to start B.<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * &lt;p/&gt;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   * How do we know with the only 
information in B that we are not ready.<a name="line.418"></a>
-<span class="sourceLineNo">419</span>   * &lt;ul&gt;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   * &lt;li&gt;easy case, the parent is 
missing from the global map&lt;/li&gt;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * &lt;li&gt;more complex case we look 
at the Stack IDs.&lt;/li&gt;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * &lt;/ul&gt;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * The Stack-IDs are added to the 
procedure order as an incremental index tracking how many times<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>   * that procedure was executed, which 
is equivalent to the number of times we wrote the procedure<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>   * to the WAL. &lt;br/&gt;<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>   * In the example above:<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>   *<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   * &lt;pre&gt;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   *   wal-2: B has stackId = [1, 2]<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>   *   wal-1: B has stackId = [1]<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>   *   wal-1: A has stackId = [0]<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>   * &lt;/pre&gt;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   *<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * Since we know that the Stack-IDs are 
incremental for a Procedure, we notice that there is a gap<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>   * in the stackIds of B, so something 
was executed before.<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * &lt;p/&gt;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * To identify when a Procedure is 
ready we do the sum of the stackIds of the procedure and the<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>   * parent. if the stackIdSum is equal 
to the sum of {1..maxStackId} then everything we need is<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * available.<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * &lt;p/&gt;<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   * Example-2<a name="line.441"></a>
-<span class="sourceLineNo">442</span>   *<a name="line.442"></a>
-<span class="sourceLineNo">443</span>   * &lt;pre&gt;<a name="line.443"></a>
-<span class="sourceLineNo">444</span>   *    wal-2 | A |              A 
stackIds = [0, 2]<a name="line.444"></a>
-<span class="sourceLineNo">445</span>   *    wal-1 | A B |            B 
stackIds = [1]<a name="line.445"></a>
-<span class="sourceLineNo">446</span>   * &lt;/pre&gt;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   *<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * There is a gap between A stackIds so 
something was executed in between.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private boolean checkReadyToRun(Entry 
rootEntry) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    assert !rootEntry.hasParent() : 
"expected root procedure, got " + rootEntry;<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span>    if (rootEntry.isFinished()) {<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>      // If the root procedure is 
finished, sub-procedures should be gone<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      if (rootEntry.childHead != null) 
{<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        LOG.error("unexpected active 
children for root-procedure: {}", rootEntry);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        for (Entry p = 
rootEntry.childHead; p != null; p = p.linkNext) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>          LOG.error("unexpected active 
children: {}", p);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        }<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>      assert rootEntry.childHead == null 
: "unexpected children on root completion. " + rootEntry;<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      rootEntry.ready = true;<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>      return true;<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>    int stackIdSum = 0;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>    int maxStackId = 0;<a 
name="line.468"></a>
-<span class="sourceLineNo">469</span>    for (int i = 0; i &lt; 
rootEntry.proto.getStackIdCount(); ++i) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      int stackId = 1 + 
rootEntry.proto.getStackId(i);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      maxStackId = Math.max(maxStackId, 
stackId);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      stackIdSum += stackId;<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>      LOG.trace("stackId={} stackIdSum={} 
maxStackid={} {}", stackId, stackIdSum, maxStackId,<a name="line.473"></a>
-<span class="sourceLineNo">474</span>        rootEntry);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    }<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>    for (Entry p = rootEntry.childHead; p 
!= null; p = p.linkNext) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      for (int i = 0; i &lt; 
p.proto.getStackIdCount(); ++i) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>        int stackId = 1 + 
p.proto.getStackId(i);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        maxStackId = Math.max(maxStackId, 
stackId);<a name="line.480"></a>
-<span class="sourceLineNo">481</span>        stackIdSum += stackId;<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>        LOG.trace("stackId={} 
stackIdSum={} maxStackid={} {}", stackId, stackIdSum, maxStackId, p);<a 
name="line.482"></a>
-<span class="sourceLineNo">483</span>      }<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    // The cmpStackIdSum is this formula 
for finding the sum of a series of numbers:<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    // 
http://www.wikihow.com/Sum-the-Integers-from-1-to-N#/Image:Sum-the-Integers-from-1-to-N-Step-2-Version-3.jpg<a
 name="line.486"></a>
-<span class="sourceLineNo">487</span>    final int cmpStackIdSum = (maxStackId 
* (maxStackId + 1) / 2);<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    if (cmpStackIdSum == stackIdSum) {<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>      rootEntry.ready = true;<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>      for (Entry p = rootEntry.childHead; 
p != null; p = p.linkNext) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        p.ready = true;<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<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 unlinkFromReplayList(Entry 
entry) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    if (replayOrderHead == entry) {<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>      replayOrderHead = 
entry.replayNext;<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    if (replayOrderTail == entry) {<a 
name="line.502"></a>
-<span class="sourceLineNo">503</span>      replayOrderTail = 
entry.replayPrev;<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    if (entry.replayPrev != null) {<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span>      entry.replayPrev.replayNext = 
entry.replayNext;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    }<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    if (entry.replayNext != null) {<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>      entry.replayNext.replayPrev = 
entry.replayPrev;<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><a name="line.512"></a>
-<span class="sourceLineNo">513</span>  private void addToReplayList(final 
Entry entry) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    unlinkFromReplayList(entry);<a 
name="line.514"></a>
-<span class="sourceLineNo">515</span>    entry.replayNext = replayOrderHead;<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>    entry.replayPrev = null;<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>    if (replayOrderHead != null) {<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>      replayOrderHead.replayPrev = 
entry;<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    } else {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      replayOrderTail = entry;<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>    }<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    replayOrderHead = entry;<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>  private void unlinkFromLinkList(Entry 
entry) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    if (entry == rootHead) {<a 
name="line.526"></a>
-<span class="sourceLineNo">527</span>      rootHead = entry.linkNext;<a 
name="line.527"></a>
-<span class="sourceLineNo">528</span>    } else if (entry == 
childUnlinkedHead) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      childUnlinkedHead = 
entry.linkNext;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    }<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    if (entry.linkPrev != null) {<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>      entry.linkPrev.linkNext = 
entry.linkNext;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    }<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if (entry.linkNext != null) {<a 
name="line.534"></a>
-<span class="sourceLineNo">535</span>      entry.linkNext.linkPrev = 
entry.linkPrev;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>  }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span>  private Entry addToLinkList(Entry 
entry, Entry linkHead) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    unlinkFromLinkList(entry);<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>    entry.linkNext = linkHead;<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>    entry.linkPrev = null;<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (linkHead != null) {<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>      linkHead.linkPrev = entry;<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    return entry;<a name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  private Entry findLinkListTail(Entry 
linkHead) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    Entry tail = linkHead;<a 
name="line.550"></a>
-<span class="sourceLineNo">551</span>    while (tail.linkNext != null) {<a 
name="line.551"></a>
-<span class="sourceLineNo">552</span>      tail = tail.linkNext;<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>    }<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    return tail;<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  private Entry addToMap(long procId, 
boolean hasParent) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    int slotIndex = getMapSlot(procId);<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>    Entry entry = getProcedure(slotIndex, 
procId);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    if (entry != null) {<a 
name="line.560"></a>
-<span class="sourceLineNo">561</span>      return entry;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>    entry = new 
Entry(procedureMap[slotIndex]);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    procedureMap[slotIndex] = entry;<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>    return entry;<a name="line.566"></a>
-<span class="sourceLineNo">567</span>  }<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>  private Entry removeFromMap(final long 
procId) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    int slotIndex = getMapSlot(procId);<a 
name="line.570"></a>
-<span class="sourceLineNo">571</span>    Entry prev = null;<a 
name="line.571"></a>
-<span class="sourceLineNo">572</span>    Entry entry = 
procedureMap[slotIndex];<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    while (entry != null) {<a 
name="line.573"></a>
-<span class="sourceLineNo">574</span>      if (procId == entry.getProcId()) 
{<a name="line.574"></a>
-<span class="sourceLineNo">575</span>        if (prev != null) {<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>          prev.hashNext = 
entry.hashNext;<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        } else {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          procedureMap[slotIndex] = 
entry.hashNext;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>        entry.hashNext = null;<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>        return entry;<a 
name="line.581"></a>
-<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      prev = entry;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      entry = entry.hashNext;<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    return null;<a name="line.586"></a>
-<span class="sourceLineNo">587</span>  }<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>  private Entry getProcedure(long procId) 
{<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    return 
getProcedure(getMapSlot(procId), procId);<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  }<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private Entry getProcedure(int 
slotIndex, long procId) {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    Entry entry = 
procedureMap[slotIndex];<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    while (entry != null) {<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>      if (procId == entry.getProcId()) 
{<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        return entry;<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>      }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      entry = entry.hashNext;<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    return null;<a name="line.601"></a>
-<span class="sourceLineNo">602</span>  }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>  private int getMapSlot(long procId) {<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>    return (int) 
(Procedure.getProcIdHashCode(procId) % procedureMap.length);<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>  }<a name="line.606"></a>
-<span class="sourceLineNo">607</span>}<a name="line.607"></a>
+<span class="sourceLineNo">082</span>    return increasing;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public void 
add(ProcedureProtos.Procedure proc) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    procMap.compute(proc.getProcId(), 
(procId, existingProc) -&gt; {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      if (existingProc == null || 
isIncreasing(existingProc, proc)) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        return proc;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      } else {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>        return existingProc;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    });<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    trackProcId(proc.getProcId());<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public void remove(long procId) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    procMap.remove(procId);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public boolean isEmpty() {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    return procMap.isEmpty();<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  public boolean contains(long procId) 
{<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    return procMap.containsKey(procId);<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * Merge the given {@link 
WALProcedureMap} into this one. The {@link WALProcedureMap} passed in<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>   * will be cleared after merging.<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public void merge(WALProcedureMap 
other) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    
other.procMap.forEach(procMap::putIfAbsent);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    maxModifiedProcId = 
Math.max(maxModifiedProcId, other.maxModifiedProcId);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    minModifiedProcId = 
Math.max(minModifiedProcId, other.minModifiedProcId);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    other.procMap.clear();<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    other.maxModifiedProcId = 
Long.MIN_VALUE;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    other.minModifiedProcId = 
Long.MAX_VALUE;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  public 
Collection&lt;ProcedureProtos.Procedure&gt; getProcedures() {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    return 
Collections.unmodifiableCollection(procMap.values());<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public long getMinModifiedProcId() {<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    return minModifiedProcId;<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>  public long getMaxModifiedProcId() {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    return maxModifiedProcId;<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>}<a name="line.132"></a>
 
 
 

Reply via email to