http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d6f420/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html
index 748314e..6dcf0c1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html
@@ -30,157 +30,173 @@
 <span class="sourceLineNo">022</span><a name="line.22"></a>
 <span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>/**<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * The ProcedureStore is used by the 
executor to persist the state of each procedure execution.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * This allows to resume the execution of 
pending/in-progress procedures in case<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * of machine failure or service 
shutdown.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> */<a name="line.31"></a>
-<span class="sourceLineNo">032</span>@InterfaceAudience.Private<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceStability.Evolving<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>public interface ProcedureStore {<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>  /**<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   * Store listener interface.<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>   * The main process should register a 
listener and respond to the store events.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   */<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  public interface ProcedureStoreListener 
{<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    /**<a name="line.40"></a>
-<span class="sourceLineNo">041</span>     * triggered when the store sync is 
completed.<a name="line.41"></a>
-<span class="sourceLineNo">042</span>     */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    void postSync();<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>    /**<a name="line.45"></a>
-<span class="sourceLineNo">046</span>     * triggered when the store is not 
able to write out data.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>     * the main process should abort.<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>     */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    void abortProcess();<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * An Iterator over a collection of 
Procedure<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public interface ProcedureIterator {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span>     * Reset the Iterator by seeking to 
the beginning of the list.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>     */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    void reset();<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>    /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>     * Returns true if the iterator has 
more elements.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>     * (In other words, returns true if 
next() would return a Procedure<a name="line.63"></a>
-<span class="sourceLineNo">064</span>     * rather than throwing an 
exception.)<a name="line.64"></a>
-<span class="sourceLineNo">065</span>     * @return true if the iterator has 
more procedures<a name="line.65"></a>
-<span class="sourceLineNo">066</span>     */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    boolean hasNext();<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span>     * Returns the next procedure in the 
iteration.<a name="line.70"></a>
-<span class="sourceLineNo">071</span>     * @throws IOException if there was 
an error fetching/deserializing the procedure<a name="line.71"></a>
-<span class="sourceLineNo">072</span>     * @return the next procedure in the 
iteration.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>     */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    Procedure next() throws 
IOException;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * Interface passed to the 
ProcedureStore.load() method to handle the store-load events.<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public interface ProcedureLoader {<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>    /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span>     * Called by ProcedureStore.load() to 
notify about the maximum proc-id in the store.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>     * @param maxProcId the highest 
proc-id in the store<a name="line.83"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.ProcedureInfo;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>/**<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * The ProcedureStore is used by the 
executor to persist the state of each procedure execution.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * This allows to resume the execution of 
pending/in-progress procedures in case<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * of machine failure or service 
shutdown.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceStability.Evolving<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>public interface ProcedureStore {<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>  /**<a name="line.36"></a>
+<span class="sourceLineNo">037</span>   * Store listener interface.<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>   * The main process should register a 
listener and respond to the store events.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  public interface ProcedureStoreListener 
{<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>     * triggered when the store sync is 
completed.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>     */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    void postSync();<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>    /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span>     * triggered when the store is not 
able to write out data.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>     * the main process should abort.<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>     */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    void abortProcess();<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * An Iterator over a collection of 
Procedure<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public interface ProcedureIterator {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span>     * Reset the Iterator by seeking to 
the beginning of the list.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>     */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    void reset();<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>    /**<a name="line.62"></a>
+<span class="sourceLineNo">063</span>     * Returns true if the iterator has 
more elements.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>     * (In other words, returns true if 
next() would return a Procedure<a name="line.64"></a>
+<span class="sourceLineNo">065</span>     * rather than throwing an 
exception.)<a name="line.65"></a>
+<span class="sourceLineNo">066</span>     * @return true if the iterator has 
more procedures<a name="line.66"></a>
+<span class="sourceLineNo">067</span>     */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    boolean hasNext();<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>     * @return true if the iterator next 
element is a completed procedure.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>     */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    boolean isNextCompleted();<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span>     * Skip the next procedure<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>     */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    void skipNext();<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>    /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span>     * Returns the next procedure in the 
iteration.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>     * @throws IOException if there was 
an error fetching/deserializing the procedure<a name="line.82"></a>
+<span class="sourceLineNo">083</span>     * @return the next procedure in the 
iteration.<a name="line.83"></a>
 <span class="sourceLineNo">084</span>     */<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    void setMaxProcId(long maxProcId);<a 
name="line.85"></a>
+<span class="sourceLineNo">085</span>    Procedure nextAsProcedure() throws 
IOException;<a name="line.85"></a>
 <span class="sourceLineNo">086</span><a name="line.86"></a>
 <span class="sourceLineNo">087</span>    /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span>     * Called by the 
ProcedureStore.load() every time a set of procedures are ready to be 
executed.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>     * The ProcedureIterator passed to 
the method, has the procedure sorted in replay-order.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>     * @param procIter iterator over the 
procedures ready to be added to the executor.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>     */<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    void load(ProcedureIterator procIter) 
throws IOException;<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>    /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span>     * Called by the 
ProcedureStore.load() in case we have procedures not-ready to be added to<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>     * the executor, which probably means 
they are corrupted since some information/link is missing.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>     * @param procIter iterator over the 
procedures not ready to be added to the executor, corrupted<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>     */<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    void 
handleCorrupted(ProcedureIterator procIter) throws IOException;<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>  /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * Add the listener to the notification 
list.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @param listener The 
AssignmentListener to register<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  void 
registerListener(ProcedureStoreListener listener);<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>   * Remove the listener from the 
notification list.<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @param listener The 
AssignmentListener to unregister<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * @return true if the listner was in 
the list and it was removed, otherwise false.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   */<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  boolean 
unregisterListener(ProcedureStoreListener listener);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * Start/Open the procedure store<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   * @param numThreads<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  void start(int numThreads) throws 
IOException;<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>   * Stop/Close the procedure store<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @param abort true if the stop is an 
abort<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  void stop(boolean abort);<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  /**<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   * @return true if the store is 
running, otherwise false.<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   */<a name="line.129"></a>
-<span class="sourceLineNo">130</span>  boolean isRunning();<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * @return the number of threads/slots 
passed to start()<a name="line.133"></a>
+<span class="sourceLineNo">088</span>     * @return the next procedure in the 
iteration as ProcedureInfo.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>     */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    ProcedureInfo 
nextAsProcedureInfo();<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>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Interface passed to the 
ProcedureStore.load() method to handle the store-load events.<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public interface ProcedureLoader {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>     * Called by ProcedureStore.load() to 
notify about the maximum proc-id in the store.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>     * @param maxProcId the highest 
proc-id in the store<a name="line.99"></a>
+<span class="sourceLineNo">100</span>     */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    void setMaxProcId(long maxProcId);<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>     * Called by the 
ProcedureStore.load() every time a set of procedures are ready to be 
executed.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>     * The ProcedureIterator passed to 
the method, has the procedure sorted in replay-order.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>     * @param procIter iterator over the 
procedures ready to be added to the executor.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>     */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    void load(ProcedureIterator procIter) 
throws IOException;<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>     * Called by the 
ProcedureStore.load() in case we have procedures not-ready to be added to<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>     * the executor, which probably means 
they are corrupted since some information/link is missing.<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>     * @param procIter iterator over the 
procedures not ready to be added to the executor, corrupted<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>     */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    void 
handleCorrupted(ProcedureIterator procIter) throws IOException;<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * Add the listener to the notification 
list.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @param listener The 
AssignmentListener to register<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  void 
registerListener(ProcedureStoreListener listener);<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>   * Remove the listener from the 
notification list.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @param listener The 
AssignmentListener to unregister<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @return true if the listner was in 
the list and it was removed, otherwise false.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   */<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  boolean 
unregisterListener(ProcedureStoreListener listener);<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>   * Start/Open the procedure store<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @param numThreads<a 
name="line.133"></a>
 <span class="sourceLineNo">134</span>   */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  int getNumThreads();<a 
name="line.135"></a>
+<span class="sourceLineNo">135</span>  void start(int numThreads) throws 
IOException;<a name="line.135"></a>
 <span class="sourceLineNo">136</span><a name="line.136"></a>
 <span class="sourceLineNo">137</span>  /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * Acquire the lease for the procedure 
store.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  void recoverLease() throws 
IOException;<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>   * Load the Procedures in the store.<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @param loader the ProcedureLoader 
that will handle the store-load events<a name="line.144"></a>
+<span class="sourceLineNo">138</span>   * Stop/Close the procedure store<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>   * @param abort true if the stop is an 
abort<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  void stop(boolean abort);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return true if the store is 
running, otherwise false.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  void load(ProcedureLoader loader) 
throws IOException;<a name="line.146"></a>
+<span class="sourceLineNo">146</span>  boolean isRunning();<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span><a name="line.147"></a>
 <span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * When a procedure is submitted to the 
executor insert(proc, null) will be called.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * 'proc' has a 'RUNNABLE' state and 
the initial information required to start up.<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   *<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * When a procedure is executed and it 
returns children insert(proc, subprocs) will be called.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * 'proc' has a 'WAITING' state and an 
update state.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * 'subprocs' are the children in 
'RUNNABLE' state with the initial information.<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   *<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   * @param proc the procedure to 
serialize and write to the store.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   * @param subprocs the newly created 
child of the proc.<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  void insert(Procedure proc, Procedure[] 
subprocs);<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>   * The specified procedure was 
executed,<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * and the new state should be written 
to the store.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @param proc the procedure to 
serialize and write to the store.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  void update(Procedure proc);<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * The specified procId was removed 
from the executor,<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   * due to completion, abort or 
failure.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * The store implementor should remove 
all the information about the specified procId.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * @param procId the ID of the 
procedure to remove.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  void delete(long procId);<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>}<a name="line.175"></a>
+<span class="sourceLineNo">149</span>   * @return the number of threads/slots 
passed to start()<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  int getNumThreads();<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>  /**<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * Acquire the lease for the procedure 
store.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  void recoverLease() throws 
IOException;<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>  /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   * Load the Procedures in the store.<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>   * @param loader the ProcedureLoader 
that will handle the store-load events<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   */<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  void load(ProcedureLoader loader) 
throws IOException;<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   * When a procedure is submitted to the 
executor insert(proc, null) will be called.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   * 'proc' has a 'RUNNABLE' state and 
the initial information required to start up.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   *<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   * When a procedure is executed and it 
returns children insert(proc, subprocs) will be called.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * 'proc' has a 'WAITING' state and an 
update state.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * 'subprocs' are the children in 
'RUNNABLE' state with the initial information.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   *<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param proc the procedure to 
serialize and write to the store.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @param subprocs the newly created 
child of the proc.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  void insert(Procedure proc, Procedure[] 
subprocs);<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>   * The specified procedure was 
executed,<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   * and the new state should be written 
to the store.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * @param proc the procedure to 
serialize and write to the store.<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  void update(Procedure proc);<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   * The specified procId was removed 
from the executor,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   * due to completion, abort or 
failure.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * The store implementor should remove 
all the information about the specified procId.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @param procId the ID of the 
procedure to remove.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  void delete(long procId);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>}<a name="line.191"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d6f420/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.BitSetNode.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.BitSetNode.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.BitSetNode.html
index f6c7b80..1c21359 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.BitSetNode.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.BitSetNode.html
@@ -422,180 +422,182 @@
 <span class="sourceLineNo">414</span>    node.updateState(procId, 
isDeleted);<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>  public void clear() {<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>    this.map.clear();<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>    resetUpdates();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>  public DeleteState isDeleted(long 
procId) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    Map.Entry&lt;Long, BitSetNode&gt; 
entry = map.floorEntry(procId);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    if (entry != null &amp;&amp; 
entry.getValue().contains(procId)) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      BitSetNode node = 
entry.getValue();<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      DeleteState state = 
node.isDeleted(procId);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      return partial &amp;&amp; 
!node.isUpdated(procId) ? DeleteState.MAYBE : state;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    return partial ? DeleteState.MAYBE : 
DeleteState.YES;<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  public long getMinProcId() {<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>    // TODO: Cache?<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    Map.Entry&lt;Long, BitSetNode&gt; 
entry = map.firstEntry();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    return entry == null ? 0 : 
entry.getValue().getMinProcId();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  public void setKeepDeletes(boolean 
keepDeletes) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    this.keepDeletes = keepDeletes;<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>    if (!keepDeletes) {<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>      Iterator&lt;Map.Entry&lt;Long, 
BitSetNode&gt;&gt; it = map.entrySet().iterator();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      while (it.hasNext()) {<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>        Map.Entry&lt;Long, BitSetNode&gt; 
entry = it.next();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        if (entry.getValue().isEmpty()) 
{<a name="line.444"></a>
-<span class="sourceLineNo">445</span>          it.remove();<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>        }<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>  public void setPartialFlag(boolean 
isPartial) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    if (this.partial &amp;&amp; 
!isPartial) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        
entry.getValue().unsetPartialFlag();<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    }<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    this.partial = isPartial;<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>  }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>  public boolean isEmpty() {<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      if (entry.getValue().isEmpty() == 
false) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>        return false;<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;<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>  public boolean isUpdated() {<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      if (entry.getValue().isUpdated() == 
false) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>        return false;<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>      }<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    }<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    return true;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>  public boolean isTracking(long minId, 
long maxId) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    // TODO: we can make it more precise, 
instead of looking just at the block<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return map.floorEntry(minId) != null 
|| map.floorEntry(maxId) != null;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  public void resetUpdates() {<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      entry.getValue().resetUpdates();<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>    }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    minUpdatedProcId = Long.MAX_VALUE;<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>    maxUpdatedProcId = Long.MIN_VALUE;<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>  public void undeleteAll() {<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      entry.getValue().undeleteAll();<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>    }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>  }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span>  private BitSetNode 
getOrCreateNode(final long procId) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    // can procId fit in the left node?<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span>    BitSetNode leftNode = null;<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>    boolean leftCanGrow = false;<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>    Map.Entry&lt;Long, BitSetNode&gt; 
leftEntry = map.floorEntry(procId);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    if (leftEntry != null) {<a 
name="line.502"></a>
-<span class="sourceLineNo">503</span>      leftNode = leftEntry.getValue();<a 
name="line.503"></a>
-<span class="sourceLineNo">504</span>      if (leftNode.contains(procId)) {<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span>        return leftNode;<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span>      }<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      leftCanGrow = 
leftNode.canGrow(procId);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>    BitSetNode rightNode = null;<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>    boolean rightCanGrow = false;<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>    Map.Entry&lt;Long, BitSetNode&gt; 
rightEntry = map.ceilingEntry(procId);<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    if (rightEntry != null) {<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>      rightNode = 
rightEntry.getValue();<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      rightCanGrow = 
rightNode.canGrow(procId);<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      if (leftNode != null) {<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>        if (leftNode.canMerge(rightNode)) 
{<a name="line.517"></a>
-<span class="sourceLineNo">518</span>          // merge left and right node<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>          return mergeNodes(leftNode, 
rightNode);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>        }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span>        if (leftCanGrow &amp;&amp; 
rightCanGrow) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>          if ((procId - 
leftNode.getEnd()) &lt;= (rightNode.getStart() - procId)) {<a 
name="line.523"></a>
-<span class="sourceLineNo">524</span>            // grow the left node<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>            return growNode(leftNode, 
procId);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>          }<a name="line.526"></a>
-<span class="sourceLineNo">527</span>          // grow the right node<a 
name="line.527"></a>
-<span class="sourceLineNo">528</span>          return growNode(rightNode, 
procId);<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><a name="line.532"></a>
-<span class="sourceLineNo">533</span>    // grow the left node<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>    if (leftCanGrow) {<a 
name="line.534"></a>
-<span class="sourceLineNo">535</span>      return growNode(leftNode, 
procId);<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>    // grow the right node<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>    if (rightCanGrow) {<a 
name="line.539"></a>
-<span class="sourceLineNo">540</span>      return growNode(rightNode, 
procId);<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span>    // add new node<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    BitSetNode node = new 
BitSetNode(procId, partial);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    map.put(node.getStart(), node);<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>    return node;<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 BitSetNode growNode(BitSetNode 
node, long procId) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    map.remove(node.getStart());<a 
name="line.550"></a>
-<span class="sourceLineNo">551</span>    node.grow(procId);<a 
name="line.551"></a>
-<span class="sourceLineNo">552</span>    map.put(node.getStart(), node);<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>    return node;<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  }<a name="line.554"></a>
-<span class="sourceLineNo">555</span><a name="line.555"></a>
-<span class="sourceLineNo">556</span>  private BitSetNode 
mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    assert leftNode.getStart() &lt; 
rightNode.getStart();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    leftNode.merge(rightNode);<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>    map.remove(rightNode.getStart());<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>    return leftNode;<a 
name="line.560"></a>
-<span class="sourceLineNo">561</span>  }<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span>  public void dump() {<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>    System.out.println("map " + 
map.size());<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    System.out.println("isUpdated " + 
isUpdated());<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    System.out.println("isEmpty " + 
isEmpty());<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      entry.getValue().dump();<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><a name="line.571"></a>
-<span class="sourceLineNo">572</span>  public void writeTo(final OutputStream 
stream) throws IOException {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    
ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.573"></a>
-<span class="sourceLineNo">574</span>        
ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      
builder.addNode(entry.getValue().convert());<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    }<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    
builder.build().writeDelimitedTo(stream);<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>  public void readFrom(final InputStream 
stream) throws IOException {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    ProcedureProtos.ProcedureStoreTracker 
data =<a name="line.582"></a>
-<span class="sourceLineNo">583</span>        
ProcedureProtos.ProcedureStoreTracker.parseDelimitedFrom(stream);<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>    map.clear();<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    for 
(ProcedureProtos.ProcedureStoreTracker.TrackerNode protoNode: 
data.getNodeList()) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>      BitSetNode node = 
BitSetNode.convert(protoNode);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      map.put(node.getStart(), node);<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
-<span class="sourceLineNo">589</span>  }<a name="line.589"></a>
-<span class="sourceLineNo">590</span>}<a name="line.590"></a>
+<span class="sourceLineNo">417</span>  public void reset() {<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>    this.keepDeletes = false;<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>    this.partial = false;<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>    this.map.clear();<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>    resetUpdates();<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public DeleteState isDeleted(long 
procId) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    Map.Entry&lt;Long, BitSetNode&gt; 
entry = map.floorEntry(procId);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    if (entry != null &amp;&amp; 
entry.getValue().contains(procId)) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      BitSetNode node = 
entry.getValue();<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      DeleteState state = 
node.isDeleted(procId);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      return partial &amp;&amp; 
!node.isUpdated(procId) ? DeleteState.MAYBE : state;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    return partial ? DeleteState.MAYBE : 
DeleteState.YES;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>  }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>  public long getMinProcId() {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>    // TODO: Cache?<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    Map.Entry&lt;Long, BitSetNode&gt; 
entry = map.firstEntry();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    return entry == null ? 0 : 
entry.getValue().getMinProcId();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>  public void setKeepDeletes(boolean 
keepDeletes) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    this.keepDeletes = keepDeletes;<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>    if (!keepDeletes) {<a 
name="line.442"></a>
+<span class="sourceLineNo">443</span>      Iterator&lt;Map.Entry&lt;Long, 
BitSetNode&gt;&gt; it = map.entrySet().iterator();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      while (it.hasNext()) {<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>        Map.Entry&lt;Long, BitSetNode&gt; 
entry = it.next();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        if (entry.getValue().isEmpty()) 
{<a name="line.446"></a>
+<span class="sourceLineNo">447</span>          it.remove();<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>        }<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    }<a name="line.450"></a>
+<span class="sourceLineNo">451</span>  }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span>  public void setPartialFlag(boolean 
isPartial) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (this.partial &amp;&amp; 
!isPartial) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        
entry.getValue().unsetPartialFlag();<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      }<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    this.partial = isPartial;<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>  public boolean isEmpty() {<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      if (entry.getValue().isEmpty() == 
false) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>        return false;<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>    return true;<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public boolean isUpdated() {<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      if (entry.getValue().isUpdated() == 
false) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        return false;<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>    return true;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span>  public boolean isTracking(long minId, 
long maxId) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    // TODO: we can make it more precise, 
instead of looking just at the block<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    return map.floorEntry(minId) != null 
|| map.floorEntry(maxId) != null;<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>  public void resetUpdates() {<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span>      entry.getValue().resetUpdates();<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    minUpdatedProcId = Long.MAX_VALUE;<a 
name="line.489"></a>
+<span class="sourceLineNo">490</span>    maxUpdatedProcId = Long.MIN_VALUE;<a 
name="line.490"></a>
+<span class="sourceLineNo">491</span>  }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>  public void undeleteAll() {<a 
name="line.493"></a>
+<span class="sourceLineNo">494</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      entry.getValue().undeleteAll();<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><a name="line.498"></a>
+<span class="sourceLineNo">499</span>  private BitSetNode 
getOrCreateNode(final long procId) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    // can procId fit in the left node?<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>    BitSetNode leftNode = null;<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>    boolean leftCanGrow = false;<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>    Map.Entry&lt;Long, BitSetNode&gt; 
leftEntry = map.floorEntry(procId);<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    if (leftEntry != null) {<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>      leftNode = leftEntry.getValue();<a 
name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (leftNode.contains(procId)) {<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>        return leftNode;<a 
name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      leftCanGrow = 
leftNode.canGrow(procId);<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>    BitSetNode rightNode = null;<a 
name="line.512"></a>
+<span class="sourceLineNo">513</span>    boolean rightCanGrow = false;<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>    Map.Entry&lt;Long, BitSetNode&gt; 
rightEntry = map.ceilingEntry(procId);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    if (rightEntry != null) {<a 
name="line.515"></a>
+<span class="sourceLineNo">516</span>      rightNode = 
rightEntry.getValue();<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      rightCanGrow = 
rightNode.canGrow(procId);<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      if (leftNode != null) {<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>        if (leftNode.canMerge(rightNode)) 
{<a name="line.519"></a>
+<span class="sourceLineNo">520</span>          // merge left and right node<a 
name="line.520"></a>
+<span class="sourceLineNo">521</span>          return mergeNodes(leftNode, 
rightNode);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>        }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span>        if (leftCanGrow &amp;&amp; 
rightCanGrow) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span>          if ((procId - 
leftNode.getEnd()) &lt;= (rightNode.getStart() - procId)) {<a 
name="line.525"></a>
+<span class="sourceLineNo">526</span>            // grow the left node<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>            return growNode(leftNode, 
procId);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>          }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>          // grow the right node<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>          return growNode(rightNode, 
procId);<a name="line.530"></a>
+<span class="sourceLineNo">531</span>        }<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      }<a name="line.532"></a>
+<span class="sourceLineNo">533</span>    }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span>    // grow the left node<a 
name="line.535"></a>
+<span class="sourceLineNo">536</span>    if (leftCanGrow) {<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span>      return growNode(leftNode, 
procId);<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    }<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span>    // grow the right node<a 
name="line.540"></a>
+<span class="sourceLineNo">541</span>    if (rightCanGrow) {<a 
name="line.541"></a>
+<span class="sourceLineNo">542</span>      return growNode(rightNode, 
procId);<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>    // add new node<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    BitSetNode node = new 
BitSetNode(procId, partial);<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    map.put(node.getStart(), node);<a 
name="line.547"></a>
+<span class="sourceLineNo">548</span>    return node;<a name="line.548"></a>
+<span class="sourceLineNo">549</span>  }<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span>  private BitSetNode growNode(BitSetNode 
node, long procId) {<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    map.remove(node.getStart());<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>    node.grow(procId);<a 
name="line.553"></a>
+<span class="sourceLineNo">554</span>    map.put(node.getStart(), node);<a 
name="line.554"></a>
+<span class="sourceLineNo">555</span>    return node;<a name="line.555"></a>
+<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
+<span class="sourceLineNo">557</span><a name="line.557"></a>
+<span class="sourceLineNo">558</span>  private BitSetNode 
mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    assert leftNode.getStart() &lt; 
rightNode.getStart();<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    leftNode.merge(rightNode);<a 
name="line.560"></a>
+<span class="sourceLineNo">561</span>    map.remove(rightNode.getStart());<a 
name="line.561"></a>
+<span class="sourceLineNo">562</span>    return leftNode;<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>  }<a name="line.563"></a>
+<span class="sourceLineNo">564</span><a name="line.564"></a>
+<span class="sourceLineNo">565</span>  public void dump() {<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>    System.out.println("map " + 
map.size());<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    System.out.println("isUpdated " + 
isUpdated());<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    System.out.println("isEmpty " + 
isEmpty());<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      entry.getValue().dump();<a 
name="line.570"></a>
+<span class="sourceLineNo">571</span>    }<a name="line.571"></a>
+<span class="sourceLineNo">572</span>  }<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>  public void writeTo(final OutputStream 
stream) throws IOException {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>    
ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        
ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.576"></a>
+<span class="sourceLineNo">577</span>    for (Map.Entry&lt;Long, 
BitSetNode&gt; entry : map.entrySet()) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      
builder.addNode(entry.getValue().convert());<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    }<a name="line.579"></a>
+<span class="sourceLineNo">580</span>    
builder.build().writeDelimitedTo(stream);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>  }<a name="line.581"></a>
+<span class="sourceLineNo">582</span><a name="line.582"></a>
+<span class="sourceLineNo">583</span>  public void readFrom(final InputStream 
stream) throws IOException {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    reset();<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    final 
ProcedureProtos.ProcedureStoreTracker data =<a name="line.585"></a>
+<span class="sourceLineNo">586</span>        
ProcedureProtos.ProcedureStoreTracker.parseDelimitedFrom(stream);<a 
name="line.586"></a>
+<span class="sourceLineNo">587</span>    for 
(ProcedureProtos.ProcedureStoreTracker.TrackerNode protoNode: 
data.getNodeList()) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      final BitSetNode node = 
BitSetNode.convert(protoNode);<a name="line.588"></a>
+<span class="sourceLineNo">589</span>      map.put(node.getStart(), node);<a 
name="line.589"></a>
+<span class="sourceLineNo">590</span>    }<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>
 
 
 

Reply via email to