You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/07/24 14:50:28 UTC
[01/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site 26189c765 -> 88a2fa464
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
index 1648ba3..570477d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
@@ -27,264 +27,296 @@
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import static org.junit.Assert.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.ArrayList;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.HashMap;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.HashSet;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Objects;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.TableName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Put;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Result;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Table;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.FilterTests;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.After;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.AfterClass;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.Before;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.ClassRule;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.Rule;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.rules.TestName;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.slf4j.Logger;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>class StringRange {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private String start = null;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private String end = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private boolean startInclusive = true;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> private boolean endInclusive = false;<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> public StringRange(String start, boolean startInclusive, String end,<a name="line.63"></a>
-<span class="sourceLineNo">064</span> boolean endInclusive) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> this.start = start;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> this.startInclusive = startInclusive;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> this.end = end;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.endInclusive = endInclusive;<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 String getStart() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return this.start;<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 String getEnd() {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> return this.end;<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 isStartInclusive() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return this.startInclusive;<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 isEndInclusive() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return this.endInclusive;<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> @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public int hashCode() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> int hashCode = 0;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> if (this.start != null) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> hashCode ^= this.start.hashCode();<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> if (this.end != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> hashCode ^= this.end.hashCode();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return hashCode;<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> @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean equals(Object obj) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (this == obj) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return true;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (obj == null) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> return false;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span> if (!(obj instanceof StringRange)) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return false;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> StringRange oth = (StringRange) obj;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> return this.startInclusive == oth.startInclusive &&<a name="line.112"></a>
-<span class="sourceLineNo">113</span> this.endInclusive == oth.endInclusive &&<a name="line.113"></a>
-<span class="sourceLineNo">114</span> Objects.equals(this.start, oth.start) &&<a name="line.114"></a>
-<span class="sourceLineNo">115</span> Objects.equals(this.end, oth.end);<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> @Override<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public String toString() {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> String result = (this.startInclusive ? "[" : "(")<a name="line.120"></a>
-<span class="sourceLineNo">121</span> + (this.start == null ? null : this.start) + ", "<a name="line.121"></a>
-<span class="sourceLineNo">122</span> + (this.end == null ? null : this.end)<a name="line.122"></a>
-<span class="sourceLineNo">123</span> + (this.endInclusive ? "]" : ")");<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return result;<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> public boolean inRange(String value) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> boolean afterStart = true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (this.start != null) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> int startCmp = value.compareTo(this.start);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> afterStart = this.startInclusive ? startCmp >= 0 : startCmp > 0;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> boolean beforeEnd = true;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (this.end != null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> int endCmp = value.compareTo(this.end);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> beforeEnd = this.endInclusive ? endCmp <= 0 : endCmp < 0;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> return afterStart && beforeEnd;<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>}<a name="line.143"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.ArrayList;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.HashMap;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.HashSet;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Map;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.Objects;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.Cell;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Put;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Result;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Table;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.filter.FilterList.Operator;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.FilterTests;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.After;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.AfterClass;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.Before;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.BeforeClass;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.ClassRule;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.Rule;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.rules.TestName;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.Logger;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.LoggerFactory;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>class StringRange {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private String start = null;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private String end = null;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private boolean startInclusive = true;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private boolean endInclusive = false;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> public StringRange(String start, boolean startInclusive, String end,<a name="line.65"></a>
+<span class="sourceLineNo">066</span> boolean endInclusive) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> this.start = start;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> this.startInclusive = startInclusive;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.end = end;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> this.endInclusive = endInclusive;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> public String getStart() {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return this.start;<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> public String getEnd() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> return this.end;<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> public boolean isStartInclusive() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return this.startInclusive;<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 boolean isEndInclusive() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return this.endInclusive;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public int hashCode() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> int hashCode = 0;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> if (this.start != null) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> hashCode ^= this.start.hashCode();<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> if (this.end != null) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> hashCode ^= this.end.hashCode();<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return hashCode;<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> @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public boolean equals(Object obj) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (this == obj) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> return true;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span> if (obj == null) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return false;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> if (!(obj instanceof StringRange)) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return false;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> StringRange oth = (StringRange) obj;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return this.startInclusive == oth.startInclusive &&<a name="line.114"></a>
+<span class="sourceLineNo">115</span> this.endInclusive == oth.endInclusive &&<a name="line.115"></a>
+<span class="sourceLineNo">116</span> Objects.equals(this.start, oth.start) &&<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Objects.equals(this.end, oth.end);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> @Override<a name="line.120"></a>
+<span class="sourceLineNo">121</span> public String toString() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> String result = (this.startInclusive ? "[" : "(")<a name="line.122"></a>
+<span class="sourceLineNo">123</span> + (this.start == null ? null : this.start) + ", "<a name="line.123"></a>
+<span class="sourceLineNo">124</span> + (this.end == null ? null : this.end)<a name="line.124"></a>
+<span class="sourceLineNo">125</span> + (this.endInclusive ? "]" : ")");<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return result;<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 boolean inRange(String value) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> boolean afterStart = true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (this.start != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> int startCmp = value.compareTo(this.start);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> afterStart = this.startInclusive ? startCmp >= 0 : startCmp > 0;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> boolean beforeEnd = true;<a name="line.136"></a>
+<span class="sourceLineNo">137</span> if (this.end != null) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> int endCmp = value.compareTo(this.end);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> beforeEnd = this.endInclusive ? endCmp <= 0 : endCmp < 0;<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> return afterStart && beforeEnd;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>@Category({FilterTests.class, MediumTests.class})<a name="line.146"></a>
-<span class="sourceLineNo">147</span>public class TestColumnRangeFilter {<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> @ClassRule<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.150"></a>
-<span class="sourceLineNo">151</span> HBaseClassTestRule.forClass(TestColumnRangeFilter.class);<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.153"></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><a name="line.147"></a>
+<span class="sourceLineNo">148</span>@Category({FilterTests.class, MediumTests.class})<a name="line.148"></a>
+<span class="sourceLineNo">149</span>public class TestColumnRangeFilter {<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> @ClassRule<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.152"></a>
+<span class="sourceLineNo">153</span> HBaseClassTestRule.forClass(TestColumnRangeFilter.class);<a name="line.153"></a>
<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> private static final Logger LOG = LoggerFactory.getLogger(TestColumnRangeFilter.class);<a name="line.155"></a>
+<span class="sourceLineNo">155</span> private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.155"></a>
<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> @Rule<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public TestName name = new TestName();<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @BeforeClass<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public static void setUpBeforeClass() throws Exception {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> TEST_UTIL.startMiniCluster();<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> @AfterClass<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public static void tearDownAfterClass() throws Exception {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> TEST_UTIL.shutdownMiniCluster();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> @Before<a name="line.170"></a>
-<span class="sourceLineNo">171</span> public void setUp() throws Exception {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Nothing to do.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> @After<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public void tearDown() throws Exception {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // Nothing to do.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> @Test<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public void TestColumnRangeFilterClient() throws Exception {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> String family = "Family";<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Table ht = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.183"></a>
-<span class="sourceLineNo">184</span> Bytes.toBytes(family), Integer.MAX_VALUE);<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> List<String> rows = generateRandomWords(10, 8);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> long maxTimestamp = 2;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> List<String> columns = generateRandomWords(20000, 8);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> List<KeyValue> kvList = new ArrayList<>();<a name="line.190"></a>
+<span class="sourceLineNo">157</span> private static final Logger LOG = LoggerFactory.getLogger(TestColumnRangeFilter.class);<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> @Rule<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public TestName name = new TestName();<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @BeforeClass<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public static void setUpBeforeClass() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> TEST_UTIL.startMiniCluster();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> @AfterClass<a name="line.167"></a>
+<span class="sourceLineNo">168</span> public static void tearDownAfterClass() throws Exception {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> TEST_UTIL.shutdownMiniCluster();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> @Before<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public void setUp() throws Exception {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Nothing to do.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> @After<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public void tearDown() throws Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // Nothing to do.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> @Test<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public void TestColumnRangeFilterClient() throws Exception {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> String family = "Family";<a name="line.184"></a>
+<span class="sourceLineNo">185</span> Table ht = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.185"></a>
+<span class="sourceLineNo">186</span> Bytes.toBytes(family), Integer.MAX_VALUE);<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> List<String> rows = generateRandomWords(10, 8);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> long maxTimestamp = 2;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> List<String> columns = generateRandomWords(20000, 8);<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> Map<StringRange, List<KeyValue>> rangeMap = new HashMap<>();<a name="line.192"></a>
+<span class="sourceLineNo">192</span> List<KeyValue> kvList = new ArrayList<>();<a name="line.192"></a>
<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> rangeMap.put(new StringRange(null, true, "b", false),<a name="line.194"></a>
-<span class="sourceLineNo">195</span> new ArrayList<>());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> rangeMap.put(new StringRange("p", true, "q", false),<a name="line.196"></a>
+<span class="sourceLineNo">194</span> Map<StringRange, List<KeyValue>> rangeMap = new HashMap<>();<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> rangeMap.put(new StringRange(null, true, "b", false),<a name="line.196"></a>
<span class="sourceLineNo">197</span> new ArrayList<>());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> rangeMap.put(new StringRange("r", false, "s", true),<a name="line.198"></a>
+<span class="sourceLineNo">198</span> rangeMap.put(new StringRange("p", true, "q", false),<a name="line.198"></a>
<span class="sourceLineNo">199</span> new ArrayList<>());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> rangeMap.put(new StringRange("z", false, null, false),<a name="line.200"></a>
+<span class="sourceLineNo">200</span> rangeMap.put(new StringRange("r", false, "s", true),<a name="line.200"></a>
<span class="sourceLineNo">201</span> new ArrayList<>());<a name="line.201"></a>
-<span class="sourceLineNo">202</span> String valueString = "ValueString";<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> for (String row : rows) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Put p = new Put(Bytes.toBytes(row));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> p.setDurability(Durability.SKIP_WAL);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> for (String column : columns) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> for (long timestamp = 1; timestamp <= maxTimestamp; timestamp++) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> KeyValue kv = KeyValueTestUtil.create(row, family, column, timestamp,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> valueString);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> p.add(kv);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> kvList.add(kv);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> for (StringRange s : rangeMap.keySet()) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> if (s.inRange(column)) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> rangeMap.get(s).add(kv);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> ht.put(p);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> TEST_UTIL.flush();<a name="line.223"></a>
+<span class="sourceLineNo">202</span> rangeMap.put(new StringRange("z", false, null, false),<a name="line.202"></a>
+<span class="sourceLineNo">203</span> new ArrayList<>());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> String valueString = "ValueString";<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> for (String row : rows) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Put p = new Put(Bytes.toBytes(row));<a name="line.207"></a>
+<span class="sourceLineNo">208</span> p.setDurability(Durability.SKIP_WAL);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> for (String column : columns) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> for (long timestamp = 1; timestamp <= maxTimestamp; timestamp++) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> KeyValue kv = KeyValueTestUtil.create(row, family, column, timestamp,<a name="line.211"></a>
+<span class="sourceLineNo">212</span> valueString);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> p.add(kv);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> kvList.add(kv);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> for (StringRange s : rangeMap.keySet()) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (s.inRange(column)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> rangeMap.get(s).add(kv);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> ht.put(p);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> ColumnRangeFilter filter;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> Scan scan = new Scan();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> scan.setMaxVersions();<a name="line.227"></a>
-<span class="sourceLineNo">228</span> for (StringRange s : rangeMap.keySet()) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> filter = new ColumnRangeFilter(s.getStart() == null ? null<a name="line.229"></a>
-<span class="sourceLineNo">230</span> : Bytes.toBytes(s.getStart()), s.isStartInclusive(),<a name="line.230"></a>
-<span class="sourceLineNo">231</span> s.getEnd() == null ? null : Bytes.toBytes(s.getEnd()),<a name="line.231"></a>
-<span class="sourceLineNo">232</span> s.isEndInclusive());<a name="line.232"></a>
-<span class="sourceLineNo">233</span> scan.setFilter(filter);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> ResultScanner scanner = ht.getScanner(scan);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> List<Cell> results = new ArrayList<>();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.info("scan column range: " + s.toString());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> long timeBeforeScan = System.currentTimeMillis();<a name="line.237"></a>
+<span class="sourceLineNo">225</span> TEST_UTIL.flush();<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> ColumnRangeFilter filter;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> Scan scan = new Scan();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> scan.setMaxVersions();<a name="line.229"></a>
+<span class="sourceLineNo">230</span> for (StringRange s : rangeMap.keySet()) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> filter = new ColumnRangeFilter(s.getStart() == null ? null : Bytes.toBytes(s.getStart()),<a name="line.231"></a>
+<span class="sourceLineNo">232</span> s.isStartInclusive(), s.getEnd() == null ? null : Bytes.toBytes(s.getEnd()),<a name="line.232"></a>
+<span class="sourceLineNo">233</span> s.isEndInclusive());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> assertEquals(rangeMap.get(s).size(), cellsCount(ht, filter));<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span> ht.close();<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> Result result;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> while ((result = scanner.next()) != null) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> for (Cell kv : result.listCells()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> results.add(kv);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> long scanTime = System.currentTimeMillis() - timeBeforeScan;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> scanner.close();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> LOG.info("scan time = " + scanTime + "ms");<a name="line.247"></a>
-<span class="sourceLineNo">248</span> LOG.info("found " + results.size() + " results");<a name="line.248"></a>
-<span class="sourceLineNo">249</span> LOG.info("Expecting " + rangeMap.get(s).size() + " results");<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> for (KeyValue kv : results) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> LOG.info("found row " + Bytes.toString(kv.getRow()) + ", column "<a name="line.253"></a>
-<span class="sourceLineNo">254</span> + Bytes.toString(kv.getQualifier()));<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> */<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> assertEquals(rangeMap.get(s).size(), results.size());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ht.close();<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> List<String> generateRandomWords(int numberOfWords, int maxLengthOfWords) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> Set<String> wordSet = new HashSet<>();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> for (int i = 0; i < numberOfWords; i++) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> int lengthOfWords = (int) (Math.random() * maxLengthOfWords) + 1;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> char[] wordChar = new char[lengthOfWords];<a name="line.267"></a>
-<span class="sourceLineNo">268</span> for (int j = 0; j < wordChar.length; j++) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> wordChar[j] = (char) (Math.random() * 26 + 97);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> String word = new String(wordChar);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> wordSet.add(word);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> List<String> wordList = new ArrayList<>(wordSet);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return wordList;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>}<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">239</span> @Test<a name="line.239"></a>
+<span class="sourceLineNo">240</span> public void TestColumnRangeFilterWithColumnPaginationFilter() throws Exception {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> String family = "Family";<a name="line.241"></a>
+<span class="sourceLineNo">242</span> String table = "TestColumnRangeFilterWithColumnPaginationFilter";<a name="line.242"></a>
+<span class="sourceLineNo">243</span> try (Table ht =<a name="line.243"></a>
+<span class="sourceLineNo">244</span> TEST_UTIL.createTable(TableName.valueOf(table), Bytes.toBytes(family), Integer.MAX_VALUE)) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> // one row.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> String row = "row";<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // One version<a name="line.247"></a>
+<span class="sourceLineNo">248</span> long timestamp = 100;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // 10 columns<a name="line.249"></a>
+<span class="sourceLineNo">250</span> int[] columns = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };<a name="line.250"></a>
+<span class="sourceLineNo">251</span> String valueString = "ValueString";<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> Put p = new Put(Bytes.toBytes(row));<a name="line.253"></a>
+<span class="sourceLineNo">254</span> p.setDurability(Durability.SKIP_WAL);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> for (int column : columns) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> KeyValue kv =<a name="line.256"></a>
+<span class="sourceLineNo">257</span> KeyValueTestUtil.create(row, family, Integer.toString(column), timestamp, valueString);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> p.add(kv);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> ht.put(p);<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> TEST_UTIL.flush();<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> // Column range from 1 to 9.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> StringRange stringRange = new StringRange("1", true, "9", false);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> ColumnRangeFilter filter1 = new ColumnRangeFilter(Bytes.toBytes(stringRange.getStart()),<a name="line.266"></a>
+<span class="sourceLineNo">267</span> stringRange.isStartInclusive(), Bytes.toBytes(stringRange.getEnd()),<a name="line.267"></a>
+<span class="sourceLineNo">268</span> stringRange.isEndInclusive());<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> ColumnPaginationFilter filter2 = new ColumnPaginationFilter(5, 0);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> ColumnPaginationFilter filter3 = new ColumnPaginationFilter(5, 1);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ColumnPaginationFilter filter4 = new ColumnPaginationFilter(5, 2);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ColumnPaginationFilter filter5 = new ColumnPaginationFilter(5, 6);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> ColumnPaginationFilter filter6 = new ColumnPaginationFilter(5, 9);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter2)));<a name="line.275"></a>
+<span class="sourceLineNo">276</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter3)));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter4)));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals(2, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter5)));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertEquals(0, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter6)));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> private int cellsCount(Table table, Filter filter) throws IOException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Scan scan = new Scan().setFilter(filter).readAllVersions();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> List<Cell> results = new ArrayList<>();<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Result result;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> while ((result = scanner.next()) != null) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> result.listCells().forEach(results::add);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return results.size();<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> List<String> generateRandomWords(int numberOfWords, int maxLengthOfWords) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Set<String> wordSet = new HashSet<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (int i = 0; i < numberOfWords; i++) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> int lengthOfWords = (int) (Math.random() * maxLengthOfWords) + 1;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> char[] wordChar = new char[lengthOfWords];<a name="line.299"></a>
+<span class="sourceLineNo">300</span> for (int j = 0; j < wordChar.length; j++) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> wordChar[j] = (char) (Math.random() * 26 + 97);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> String word = new String(wordChar);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> wordSet.add(word);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span> List<String> wordList = new ArrayList<>(wordSet);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return wordList;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockNextRowFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockNextRowFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockNextRowFilter.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockNextRowFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockNextRowFilter.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockSeekHintFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockSeekHintFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockSeekHintFilter.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockSeekHintFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockSeekHintFilter.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.TransformFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.TransformFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.TransformFilter.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.TransformFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.TransformFilter.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
index 85b5ac3..77c7d15 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.525"></a>
<span class="sourceLineNo">526</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.526"></a>
<span class="sourceLineNo">527</span> filterList.filterCell(null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -544,7 +544,7 @@
<span class="sourceLineNo">536</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.536"></a>
<span class="sourceLineNo">537</span> Arrays.asList(new Filter[] { filterNoHint, filterMinHint, filterMaxHint }));<a name="line.537"></a>
<span class="sourceLineNo">538</span> filterList.filterCell(null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), maxKeyValue));<a name="line.539"></a>
+<span class="sourceLineNo">539</span> assertEquals(0, comparator.compare(filterList.getNextCellHint(null), minKeyValue));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.540"></a>
<span class="sourceLineNo">541</span> Arrays.asList(new Filter[] { filterNoHint, filterMaxHint }));<a name="line.541"></a>
<span class="sourceLineNo">542</span> filterList.filterCell(null);<a name="line.542"></a>
@@ -752,10 +752,10 @@
<span class="sourceLineNo">744</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.744"></a>
<span class="sourceLineNo">745</span><a name="line.745"></a>
<span class="sourceLineNo">746</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter5, filter6);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.747"></a>
+<span class="sourceLineNo">747</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter4, filter6);<a name="line.749"></a>
-<span class="sourceLineNo">750</span> assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, filterList.filterCell(kv1));<a name="line.750"></a>
+<span class="sourceLineNo">750</span> assertEquals(ReturnCode.NEXT_COL, filterList.filterCell(kv1));<a name="line.750"></a>
<span class="sourceLineNo">751</span><a name="line.751"></a>
<span class="sourceLineNo">752</span> filterList = new FilterList(Operator.MUST_PASS_ALL, filter3, filter1);<a name="line.752"></a>
<span class="sourceLineNo">753</span> assertEquals(ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW, filterList.filterCell(kv1));<a name="line.753"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
new file mode 100644
index 0000000..3530266
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
@@ -0,0 +1,202 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership. The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License. You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.List;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.concurrent.CountDownLatch;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.TableName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.Put;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.Result;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.Table;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.assignment.MergeTableRegionsProcedure;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.master.assignment.UnassignProcedure;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.AfterClass;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Assert;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.Logger;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category({MasterTests.class, MediumTests.class})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestMergeTableRegionsWhileRSCrash {<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span> HBaseClassTestRule.forClass(TestMergeTableRegionsWhileRSCrash.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private static final Logger LOG = LoggerFactory<a name="line.58"></a>
+<span class="sourceLineNo">059</span> .getLogger(TestMergeTableRegionsWhileRSCrash.class);<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private static TableName TABLE_NAME = TableName.valueOf("test");<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private static Admin admin;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private static byte[] CF = Bytes.toBytes("cf");<a name="line.64"></a>
+<span class="sourceLineNo">065</span> private static byte[] SPLITKEY = Bytes.toBytes("row5");<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private static CountDownLatch mergeCommitArrive = new CountDownLatch(1);<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private static Table TABLE;<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> @BeforeClass<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public static void setupCluster() throws Exception {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> UTIL.startMiniCluster(1);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> admin = UTIL.getHBaseAdmin();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> byte[][] splitKeys = new byte[1][];<a name="line.74"></a>
+<span class="sourceLineNo">075</span> splitKeys[0] = SPLITKEY;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> TABLE = UTIL.createTable(TABLE_NAME, CF, splitKeys);<a name="line.76"></a>
+<span class="sourceLineNo">077</span> UTIL.waitTableAvailable(TABLE_NAME);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> @AfterClass<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public static void cleanupTest() throws Exception {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> try {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> UTIL.shutdownMiniCluster();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> } catch (Exception e) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> LOG.warn("failure shutting down cluster", e);<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><a name="line.88"></a>
+<span class="sourceLineNo">089</span> @Test<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void test() throws Exception {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> //write some rows to the table<a name="line.91"></a>
+<span class="sourceLineNo">092</span> for (int i = 0; i < 10; i++) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> byte[] row = Bytes.toBytes("row" + i);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> Put put = new Put(row);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> put.addColumn(CF, CF, CF);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> TABLE.put(put);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> MasterProcedureEnv env = UTIL.getMiniHBaseCluster().getMaster()<a name="line.98"></a>
+<span class="sourceLineNo">099</span> .getMasterProcedureExecutor().getEnvironment();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> final ProcedureExecutor<MasterProcedureEnv> executor = UTIL.getMiniHBaseCluster()<a name="line.100"></a>
+<span class="sourceLineNo">101</span> .getMaster().getMasterProcedureExecutor();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> List<RegionInfo> regionInfos = admin.getRegions(TABLE_NAME);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> MergeTableRegionsProcedure mergeTableRegionsProcedure = new MergeTableRegionsProcedure(<a name="line.103"></a>
+<span class="sourceLineNo">104</span> env, regionInfos.get(0), regionInfos.get(1));<a name="line.104"></a>
+<span class="sourceLineNo">105</span> executor.submitProcedure(mergeTableRegionsProcedure);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> UTIL.waitFor(30000, () -> executor.getProcedures().stream()<a name="line.106"></a>
+<span class="sourceLineNo">107</span> .filter(p -> p instanceof UnassignProcedure)<a name="line.107"></a>
+<span class="sourceLineNo">108</span> .map(p -> (UnassignProcedure) p)<a name="line.108"></a>
+<span class="sourceLineNo">109</span> .anyMatch(p -> TABLE_NAME.equals(p.getTableName())));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> UTIL.getMiniHBaseCluster().killRegionServer(<a name="line.110"></a>
+<span class="sourceLineNo">111</span> UTIL.getMiniHBaseCluster().getRegionServer(0).getServerName());<a name="line.111"></a>
+<span class="sourceLineNo">112</span> UTIL.getMiniHBaseCluster().startRegionServer();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> UTIL.waitUntilNoRegionsInTransition();<a name="line.113"></a>
+<span class="sourceLineNo">114</span> Scan scan = new Scan();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> ResultScanner results = TABLE.getScanner(scan);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> int count = 0;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Result result = null;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> while ((result = results.next()) != null) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> count++;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span> Assert.assertEquals("There should be 10 rows!", 10, count);<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span><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><a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>}<a name="line.130"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
[08/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/filter/FilterListWithAND.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/FilterListWithAND.html b/devapidocs/org/apache/hadoop/hbase/filter/FilterListWithAND.html
index fa7bcad..74ec75f 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/FilterListWithAND.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/FilterListWithAND.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -264,13 +264,17 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
</td>
</tr>
<tr id="i8" class="altColor">
+<td class="colFirst"><code>private boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/FilterListWithAND.html#isIncludeRelatedReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">isIncludeRelatedReturnCode</a></span>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc)</code> </td>
+</tr>
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/FilterListWithAND.html#mergeReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">mergeReturnCode</a></span>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc,
<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> localRC)</code>
<div class="block">FilterList with MUST_PASS_ALL choose the maximal forward step among sub-filters in filter list.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/FilterListWithAND.html#reset--">reset</a></span>()</code>
<div class="block">Filters that are purely stateless and do nothing in their reset() methods can inherit
@@ -427,13 +431,22 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
</dl>
</li>
</ul>
+<a name="isIncludeRelatedReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isIncludeRelatedReturnCode</h4>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.157">isIncludeRelatedReturnCode</a>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc)</pre>
+</li>
+</ul>
<a name="filterCell-org.apache.hadoop.hbase.Cell-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>filterCell</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.158">filterCell</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> c)
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.163">filterCell</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> c)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterCell-org.apache.hadoop.hbase.Cell-">Filter</a></code></span></div>
<div class="block">A way to filter based on the column family, column qualifier and/or the column value. Return
@@ -470,7 +483,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockList">
<li class="blockList">
<h4>reset</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.184">reset</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.194">reset</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#reset--">FilterBase</a></code></span></div>
<div class="block">Filters that are purely stateless and do nothing in their reset() methods can inherit
@@ -494,7 +507,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockList">
<li class="blockList">
<h4>filterRowKey</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.192">filterRowKey</a>(byte[] rowKey,
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.202">filterRowKey</a>(byte[] rowKey,
int offset,
int length)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -527,7 +540,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockList">
<li class="blockList">
<h4>filterRowKey</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.207">filterRowKey</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> firstRowCell)
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.217">filterRowKey</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> firstRowCell)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterRowKey-org.apache.hadoop.hbase.Cell-">Filter</a></code></span></div>
<div class="block">Filters a row based on the row key. If this returns true, the entire row will be excluded. If
@@ -555,7 +568,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockList">
<li class="blockList">
<h4>filterAllRemaining</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.225">filterAllRemaining</a>()
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.235">filterAllRemaining</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#filterAllRemaining--">FilterBase</a></code></span></div>
<div class="block">Filters that never filter all remaining can inherit this implementation that
@@ -581,7 +594,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockList">
<li class="blockList">
<h4>filterRow</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.238">filterRow</a>()
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.248">filterRow</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#filterRow--">FilterBase</a></code></span></div>
<div class="block">Filters that never filter by rows based on previously gathered state from
@@ -610,7 +623,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/filter/FilterListBase.ht
<ul class="blockListLast">
<li class="blockList">
<h4>getNextCellHint</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.252">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> currentCell)
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html#line.262">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> currentCell)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#getNextCellHint-org.apache.hadoop.hbase.Cell-">FilterBase</a></code></span></div>
<div class="block">Filters that are not sure which key must be next seeked to, can inherit
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/filter/class-use/Filter.ReturnCode.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/class-use/Filter.ReturnCode.html b/devapidocs/org/apache/hadoop/hbase/filter/class-use/Filter.ReturnCode.html
index 525f9a2..4ce1b05 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/class-use/Filter.ReturnCode.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/class-use/Filter.ReturnCode.html
@@ -477,30 +477,34 @@ the order they are declared.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code>private boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">FilterListWithAND.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithAND.html#isIncludeRelatedReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">isIncludeRelatedReturnCode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc)</code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>protected static boolean</code></td>
<td class="colLast"><span class="typeNameLabel">FilterListBase.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListBase.html#isInReturnCodes-org.apache.hadoop.hbase.filter.Filter.ReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode...-">isInReturnCodes</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> testRC,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a>... returnCodes)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected static boolean</code></td>
<td class="colLast"><span class="typeNameLabel">FilterListBase.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListBase.html#isInReturnCodes-org.apache.hadoop.hbase.filter.Filter.ReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode...-">isInReturnCodes</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> testRC,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a>... returnCodes)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a></code></td>
<td class="colLast"><span class="typeNameLabel">FilterListWithAND.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithAND.html#mergeReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">mergeReturnCode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> localRC)</code>
<div class="block">FilterList with MUST_PASS_ALL choose the maximal forward step among sub-filters in filter list.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a></code></td>
<td class="colLast"><span class="typeNameLabel">FilterListWithOR.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithOR.html#mergeReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">mergeReturnCode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> rc,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> localRC)</code>
<div class="block">FilterList with MUST_PASS_ONE choose the minimal forward step among sub-filter in filter list.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><span class="typeNameLabel">FilterListWithOR.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithOR.html#shouldPassCurrentCellToFilter-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">shouldPassCurrentCellToFilter</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> prevCell,
<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> currentCell,
@@ -510,13 +514,13 @@ the order they are declared.</div>
in filter list return SKIP, then the filter list will return SKIP.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">FilterListWithOR.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithOR.html#updatePrevCellList-int-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">updatePrevCellList</a></span>(int index,
<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> currentCell,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> currentRC)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">FilterListWithOR.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/filter/FilterListWithOR.html#updatePrevFilterRCList-int-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">updatePrevFilterRCList</a></span>(int index,
<a href="../../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter">Filter.ReturnCode</a> currentRC)</code> </td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index ca3b309..3014969 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -183,14 +183,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">CompareFilter.CompareOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 6ef479a..6bc26ee 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -273,12 +273,12 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 29a79fd..7600159 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -349,9 +349,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index b8bf0a6..bc33c0a 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -293,9 +293,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
</ul>
</li>
[09/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/checkstyle.rss
----------------------------------------------------------------------
diff --git a/checkstyle.rss b/checkstyle.rss
index e67d642..9db6160 100644
--- a/checkstyle.rss
+++ b/checkstyle.rss
@@ -25,8 +25,8 @@ under the License.
<language>en-us</language>
<copyright>©2007 - 2018 The Apache Software Foundation</copyright>
<item>
- <title>File: 3691,
- Errors: 15670,
+ <title>File: 3692,
+ Errors: 15659,
Warnings: 0,
Infos: 0
</title>
@@ -18288,6 +18288,20 @@ under the License.
</tr>
<tr>
<td>
+ <a href="http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash.java">org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
<a href="http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.IntegrationTestLazyCfLoading.java">org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java</a>
</td>
<td>
@@ -22567,7 +22581,7 @@ under the License.
0
</td>
<td>
- 22
+ 11
</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index 47a91e6..c8e0ce2 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Code of Conduct Policy
@@ -375,7 +375,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index af82acb..6d14ee7 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependencies</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index aad762c..472ea72 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Reactor Dependency Convergence</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -905,7 +905,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 6f41023..06ede1f 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Dependency Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -313,7 +313,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index c2ebac7..56b7e94 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1005,7 +1005,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 727acbd..58f98ac 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -3789,21 +3789,21 @@
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Mon Jul 23 14:39:55 UTC 2018"</code></td>
+<td class="colLast"><code>"Tue Jul 24 14:40:25 UTC 2018"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"4804483f7e55edf91a8e9d7ad30ad8239a96eaf3"</code></td>
+<td class="colLast"><code>"a888af3dc9320a5dc3c2e41e46e31522c7a0e356"</code></td>
</tr>
<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#srcChecksum">srcChecksum</a></code></td>
-<td class="colLast"><code>"ff61797fa6fbedfa31d17ed25b27b2c0"</code></td>
+<td class="colLast"><code>"b43ba9954bfea8c0acace4183e93e9cd"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.url">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index f06061d..dc0c4da 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -10343,12 +10343,22 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#checkClosed--">checkClosed()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/ConnectionImplementation.html" title="class in org.apache.hadoop.hbase.client">ConnectionImplementation</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegion(MasterProcedureEnv)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">SplitTableRegionProcedure</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-">checkClosedRegion(MasterProcedureEnv, RegionInfo)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">MergeTableRegionsProcedure</a></dt>
<dd>
<div class="block">Check whether there is recovered.edits in the closed region
If any, that means this region is not closed property, we need
to abort region merge to prevent data loss</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegion(MasterProcedureEnv)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">SplitTableRegionProcedure</a></dt>
+<dd>
+<div class="block">Check whether there is recovered.edits in the closed region
+ If any, that means this region is not closed property, we need
+ to abort region split to prevent data loss</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegions(MasterProcedureEnv)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">MergeTableRegionsProcedure</a></dt>
+<dd>
+<div class="block">check the closed regions</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/util/FSUtils.html#checkClusterIdExists-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-int-">checkClusterIdExists(FileSystem, Path, int)</a></span> - Static method in class org.apache.hadoop.hbase.util.<a href="org/apache/hadoop/hbase/util/FSUtils.html" title="class in org.apache.hadoop.hbase.util">FSUtils</a></dt>
<dd>
<div class="block">Checks that a cluster ID file exists in the HBase root directory</div>
@@ -62945,6 +62955,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/SimpleServerRpcConnection.html#isIdle--">isIdle()</a></span> - Method in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/SimpleServerRpcConnection.html" title="class in org.apache.hadoop.hbase.ipc">SimpleServerRpcConnection</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/FilterListWithAND.html#isIncludeRelatedReturnCode-org.apache.hadoop.hbase.filter.Filter.ReturnCode-">isIncludeRelatedReturnCode(Filter.ReturnCode)</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/FilterListWithAND.html" title="class in org.apache.hadoop.hbase.filter">FilterListWithAND</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/HFileContext.html#isIncludesMvcc--">isIncludesMvcc()</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.<a href="org/apache/hadoop/hbase/io/hfile/HFileContext.html" title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/HFileContext.html#isIncludesTags--">isIncludesTags()</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.<a href="org/apache/hadoop/hbase/io/hfile/HFileContext.html" title="class in org.apache.hadoop.hbase.io.hfile">HFileContext</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index c4b3203..ffd12ac 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -167,10 +167,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
index 00a3154..e5e23ed 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
@@ -2932,17 +2932,26 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-">checkClosedRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+ <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code>
+<div class="block">Check whether there is recovered.edits in the closed region
+ If any, that means this region is not closed property, we need
+ to abort region merge to prevent data loss</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#checkMetaLoaded-org.apache.hadoop.hbase.client.RegionInfo-">checkMetaLoaded</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri)</code>
<div class="block">Used to check if the meta loading is done.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkRegionsToMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo:A-boolean-">checkRegionsToMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
boolean forcible)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkRegionsToMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-boolean-">checkRegionsToMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
@@ -2951,7 +2960,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<div class="block">One time checks.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">SplitTableRegionProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#checkSplittable-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">checkSplittable</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToSplit,
@@ -2959,97 +2968,97 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<div class="block">Check whether the region is splittable</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">AssignProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createAssignProcedure-org.apache.hadoop.hbase.client.RegionInfo-">createAssignProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">AssignProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createAssignProcedure-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">createAssignProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> targetServer)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createMergedRegionInfo-org.apache.hadoop.hbase.client.RegionInfo:A-">createMergedRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createMergedRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">createMergedRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeB)</code>
<div class="block">Create merged region info through the specified two regions</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">MergeTableRegionsProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createMergeProcedure-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">createMergeProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeB)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateNode.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates.RegionStateNode</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#createRegionStateNode-org.apache.hadoop.hbase.client.RegionInfo-">createRegionStateNode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">SplitTableRegionProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createSplitProcedure-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">createSplitProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToSplit,
byte[] splitKey)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/UnassignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">UnassignProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createUnassignProcedure-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-boolean-">createUnassignProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> destinationServer,
boolean force)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/UnassignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">UnassignProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#createUnassignProcedure-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-boolean-boolean-">createUnassignProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> destinationServer,
boolean force,
boolean removeAfterUnassigning)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#deleteRegion-org.apache.hadoop.hbase.client.RegionInfo-">deleteRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#deleteRegion-org.apache.hadoop.hbase.client.RegionInfo-">deleteRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static long</code></td>
<td class="colLast"><span class="typeNameLabel">SplitTableRegionProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#getDaughterRegionIdTimestamp-org.apache.hadoop.hbase.client.RegionInfo-">getDaughterRegionIdTimestamp</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri)</code>
<div class="block">Calculate daughter regionid to use.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.RegionFailedOpen.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates.RegionFailedOpen</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getFailedOpen-org.apache.hadoop.hbase.client.RegionInfo-">getFailedOpen</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#getFavoredNodes-org.apache.hadoop.hbase.client.RegionInfo-">getFavoredNodes</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static long</code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getMergedRegionIdTimestamp-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">getMergedRegionIdTimestamp</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeB)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureEvent.html" title="class in org.apache.hadoop.hbase.procedure2">ProcedureEvent</a><?></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#getMetaAssignEvent-org.apache.hadoop.hbase.client.RegionInfo-">getMetaAssignEvent</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> metaRegionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#getMetaForRegion-org.apache.hadoop.hbase.client.RegionInfo-">getMetaForRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private long</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#getOpenSeqNumForParentRegion-org.apache.hadoop.hbase.client.RegionInfo-">getOpenSeqNumForParentRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> region)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateNode.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates.RegionStateNode</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getOrCreateRegionStateNode-org.apache.hadoop.hbase.client.RegionInfo-">getOrCreateRegionStateNode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>(package private) static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse</code></td>
<td class="colLast"><span class="typeNameLabel">Util.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/Util.html#getRegionInfoResponse-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.client.RegionInfo-">getRegionInfoResponse</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> regionLocation,
@@ -3057,76 +3066,76 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<div class="block">Raw call to remote regionserver to get info on a particular region.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>(package private) static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse</code></td>
<td class="colLast"><span class="typeNameLabel">Util.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/Util.html#getRegionInfoResponse-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.client.RegionInfo-boolean-">getRegionInfoResponse</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> regionLocation,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri,
boolean includeBestSplitRow)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getRegionServerOfRegion-org.apache.hadoop.hbase.client.RegionInfo-">getRegionServerOfRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getRegionState-org.apache.hadoop.hbase.client.RegionInfo-">getRegionState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateNode.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates.RegionStateNode</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getRegionStateNode-org.apache.hadoop.hbase.client.RegionInfo-">getRegionStateNode</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionTransitionProcedure</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getRegionTransitionProcedure-org.apache.hadoop.hbase.client.RegionInfo-">getRegionTransitionProcedure</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a></code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#getRegionTransitionState-org.apache.hadoop.hbase.client.RegionInfo-">getRegionTransitionState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#handleRegionOverStuckWarningThreshold-org.apache.hadoop.hbase.client.RegionInfo-">handleRegionOverStuckWarningThreshold</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#isCarryingRegion-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.client.RegionInfo-">isCarryingRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#isMetaRegion-org.apache.hadoop.hbase.client.RegionInfo-">isMetaRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#isRegionInRegionStates-org.apache.hadoop.hbase.client.RegionInfo-">isRegionInRegionStates</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hri)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#isRegionInState-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.RegionState.State...-">isRegionInState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master">RegionState.State</a>... state)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#isRegionInTransition-org.apache.hadoop.hbase.client.RegionInfo-">isRegionInTransition</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#isRegionOffline-org.apache.hadoop.hbase.client.RegionInfo-">isRegionOffline</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#isRegionOnline-org.apache.hadoop.hbase.client.RegionInfo-">isRegionOnline</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.RegionInTransitionStat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html#isRegionOverThreshold-org.apache.hadoop.hbase.client.RegionInfo-">isRegionOverThreshold</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.RegionInTransitionStat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html#isRegionTwiceOverThreshold-org.apache.hadoop.hbase.client.RegionInfo-">isRegionTwiceOverThreshold</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#markRegionAsMerged-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">markRegionAsMerged</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> child,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
@@ -3135,95 +3144,95 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<div class="block">When called here, the merge has happened.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#markRegionAsSplit-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">markRegionAsSplit</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> parent,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> daughterA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> daughterB)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#mergeRegions-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">mergeRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> child,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriB,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#move-org.apache.hadoop.hbase.client.RegionInfo-">move</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#offlineRegion-org.apache.hadoop.hbase.client.RegionInfo-">offlineRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#onlineRegion-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">onlineRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#removeFromFailedOpen-org.apache.hadoop.hbase.client.RegionInfo-">removeFromFailedOpen</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#removeFromOfflineRegions-org.apache.hadoop.hbase.client.RegionInfo-">removeFromOfflineRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#sendRegionClosedNotification-org.apache.hadoop.hbase.client.RegionInfo-">sendRegionClosedNotification</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#sendRegionOpenedNotification-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">sendRegionOpenedNotification</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#setMetaAssigned-org.apache.hadoop.hbase.client.RegionInfo-boolean-">setMetaAssigned</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> metaRegionInfo,
boolean assigned)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionTransitionProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html#setRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">setRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code>
<div class="block">This setter is for subclasses to call in their
<a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#deserializeStateData-org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer-"><code>Procedure.deserializeStateData(ProcedureStateSerializer)</code></a> method.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#shouldAssignFavoredNodes-org.apache.hadoop.hbase.client.RegionInfo-">shouldAssignFavoredNodes</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> region)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#splitRegion-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">splitRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> parent,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriB,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#unassign-org.apache.hadoop.hbase.client.RegionInfo-">unassign</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#unassign-org.apache.hadoop.hbase.client.RegionInfo-boolean-">unassign</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
boolean forceNewPlan)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#updateMetaLocation-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.master.RegionState.State-">updateMetaLocation</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master">RegionState.State</a> state)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#updateRegionLocation-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.RegionState.State-org.apache.hadoop.hbase.client.Put-">updateRegionLocation</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master">RegionState.State</a> state,
<a href="../../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a> put)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#updateRegionMergeTransition-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">updateRegionMergeTransition</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode state,
@@ -3231,7 +3240,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriB)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#updateRegionSplitTransition-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">updateRegionSplitTransition</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode state,
@@ -3239,19 +3248,19 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> hriB)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html#updateRegionState-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.RegionState.State-">updateRegionState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master">RegionState.State</a> state)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#updateRegionTransition-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode-org.apache.hadoop.hbase.client.RegionInfo-long-">updateRegionTransition</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName,
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode state,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
long seqId)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.html#updateUserRegionLocation-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.RegionState.State-org.apache.hadoop.hbase.ServerName-long-long-">updateUserRegionLocation</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master">RegionState.State</a> state,
@@ -3259,7 +3268,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
long openSeqNum,
long pid)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="typeNameLabel">RegionStateStore.RegionStateVisitor.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html#visitRegionState-org.apache.hadoop.hbase.client.Result-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.RegionState.State-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-long-">visitRegionState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> result,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
@@ -3268,16 +3277,16 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> lastHost,
long openSeqNum)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#waitForAssignment-org.apache.hadoop.hbase.client.RegionInfo-">waitForAssignment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#waitForAssignment-org.apache.hadoop.hbase.client.RegionInfo-long-">waitForAssignment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
long timeout)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="typeNameLabel">AssignmentManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#waitMetaAssigned-org.apache.hadoop.hbase.procedure2.Procedure-org.apache.hadoop.hbase.client.RegionInfo-">waitMetaAssigned</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a><?> proc,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 7091f22..e73e8eb 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -552,24 +552,24 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
index ce950b0..ae0124e 100644
--- a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
@@ -104,8 +104,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/devapidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
index 5733eed..aee035f 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
@@ -647,10 +647,10 @@ public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.Return
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#areSerializedFieldsEqual-org.apache.hadoop.hbase.filter.Filter-">areSerializedFieldsEqual</a></code> in class <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html" title="class in org.apache.hadoop.hbase.filter">FilterBase</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>other</code> - </dd>
+<dd><code>o</code> - filter to serialize.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>true if and only if the fields of the filter that are serialized
- are equal to the corresponding fields in other. Used for testing.</dd>
+<dd>true if and only if the fields of the filter that are serialized are equal to the
+ corresponding fields in other. Used for testing.</dd>
</dl>
</li>
</ul>
@@ -660,7 +660,7 @@ public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.Return
<ul class="blockList">
<li class="blockList">
<h4>getNextCellHint</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.228">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> cell)</pre>
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.231">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> cell)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#getNextCellHint-org.apache.hadoop.hbase.Cell-">FilterBase</a></code></span></div>
<div class="block">Filters that are not sure which key must be next seeked to, can inherit
this implementation that, by default, returns a null Cell.
@@ -686,7 +686,7 @@ public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.Return
<ul class="blockListLast">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.233">toString</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.236">toString</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/filter/FilterBase.html#toString--">FilterBase</a></code></span></div>
<div class="block">Return filter's info for debugging and logging purpose.</div>
<dl>
[06/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index a3eaab0..f86b651 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -216,10 +216,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">ServerProcedureInterface.ServerOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MetaProcedureInterface.MetaOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">MetaProcedureInterface.MetaOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 205dfc8..d7c9073 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -437,19 +437,19 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 8beda22..4f0df47 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -219,8 +219,8 @@
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index 24066d7..fd59029 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -229,13 +229,13 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index bf38d98..2f9ca20 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -704,20 +704,20 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index 3bd22b5..23060c2 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
index f0c55c8..e8df157 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
@@ -247,8 +247,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">ProtobufLogReader.WALHdrResult</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
index cd3870f..30c4e73 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
@@ -207,8 +207,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.SourceHolder.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">MetricsReplicationSourceFactoryImpl.SourceHolder</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 8a2815f..8051208 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -142,9 +142,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 7ba3a64..6ef281d 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -191,9 +191,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 4ade4c1..2853d09 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -200,8 +200,8 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 6e0f640..c586a97 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -514,14 +514,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index bcb1724..c6caa9b 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -191,8 +191,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 97ab6a0..5fd7aae 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
<span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
<span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
<span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span> public static final String revision = "4804483f7e55edf91a8e9d7ad30ad8239a96eaf3";<a name="line.11"></a>
+<span class="sourceLineNo">011</span> public static final String revision = "a888af3dc9320a5dc3c2e41e46e31522c7a0e356";<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String date = "Mon Jul 23 14:39:55 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String date = "Tue Jul 24 14:40:25 UTC 2018";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String srcChecksum = "ff61797fa6fbedfa31d17ed25b27b2c0";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String srcChecksum = "b43ba9954bfea8c0acace4183e93e9cd";<a name="line.15"></a>
<span class="sourceLineNo">016</span>}<a name="line.16"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
index 63c6279..a659033 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
@@ -216,35 +216,38 @@
<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> /**<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param other<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @return true if and only if the fields of the filter that are serialized<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.213"></a>
+<span class="sourceLineNo">211</span> * @param o filter to serialize.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * corresponding fields in other. Used for testing.<a name="line.213"></a>
<span class="sourceLineNo">214</span> */<a name="line.214"></a>
<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
<span class="sourceLineNo">216</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> if (o == this) return true;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.221"></a>
-<span class="sourceLineNo">222</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.222"></a>
-<span class="sourceLineNo">223</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.223"></a>
-<span class="sourceLineNo">224</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> @Override<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public Cell getNextCellHint(Cell cell) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> @Override<a name="line.232"></a>
-<span class="sourceLineNo">233</span> public String toString() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return this.getClass().getSimpleName() + " "<a name="line.234"></a>
-<span class="sourceLineNo">235</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.235"></a>
-<span class="sourceLineNo">236</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.236"></a>
-<span class="sourceLineNo">237</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>}<a name="line.239"></a>
+<span class="sourceLineNo">217</span> if (o == this) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return true;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (!(o instanceof ColumnRangeFilter)) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> ColumnRangeFilter other = (ColumnRangeFilter) o;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return Bytes.equals(this.getMinColumn(), other.getMinColumn())<a name="line.224"></a>
+<span class="sourceLineNo">225</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.225"></a>
+<span class="sourceLineNo">226</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.226"></a>
+<span class="sourceLineNo">227</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public Cell getNextCellHint(Cell cell) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public String toString() {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return this.getClass().getSimpleName() + " "<a name="line.237"></a>
+<span class="sourceLineNo">238</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.238"></a>
+<span class="sourceLineNo">239</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.239"></a>
+<span class="sourceLineNo">240</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>}<a name="line.242"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html
index 3bc1dcd..0eb6460 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/FilterListWithAND.html
@@ -162,122 +162,132 @@
<span class="sourceLineNo">154</span> "Received code is not valid. rc: " + rc + ", localRC: " + localRC);<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<a name="line.155"></a>
<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> @Override<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public ReturnCode filterCell(Cell c) throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (isEmpty()) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return ReturnCode.INCLUDE;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span> ReturnCode rc = ReturnCode.INCLUDE;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> this.seekHintFilters.clear();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Filter filter = filters.get(i);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (filter.filterAllRemaining()) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return ReturnCode.NEXT_ROW;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> ReturnCode localRC;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> localRC = filter.filterCell(c);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> rc = mergeReturnCode(rc, localRC);<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (localRC == ReturnCode.SEEK_NEXT_USING_HINT) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> seekHintFilters.add(filter);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> if (!seekHintFilters.isEmpty()) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> return ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return rc;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void reset() throws IOException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> filters.get(i).reset();<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> seekHintFilters.clear();<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public boolean filterRowKey(byte[] rowKey, int offset, int length) throws IOException {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (isEmpty()) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> return super.filterRowKey(rowKey, offset, length);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span> boolean retVal = false;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> Filter filter = filters.get(i);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> if (filter.filterAllRemaining() || filter.filterRowKey(rowKey, offset, length)) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> retVal = true;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return retVal;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
-<span class="sourceLineNo">207</span> public boolean filterRowKey(Cell firstRowCell) throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> if (isEmpty()) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> return super.filterRowKey(firstRowCell);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> boolean retVal = false;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Filter filter = filters.get(i);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> if (filter.filterAllRemaining() || filter.filterRowKey(firstRowCell)) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> // Can't just return true here, because there are some filters (such as PrefixFilter) which<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // will catch the row changed event by filterRowKey(). If we return early here, those<a name="line.216"></a>
-<span class="sourceLineNo">217</span> // filters will have no chance to update their row state.<a name="line.217"></a>
-<span class="sourceLineNo">218</span> retVal = true;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">157</span> private boolean isIncludeRelatedReturnCode(ReturnCode rc) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return isInReturnCodes(rc, ReturnCode.INCLUDE, ReturnCode.INCLUDE_AND_NEXT_COL,<a name="line.158"></a>
+<span class="sourceLineNo">159</span> ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW);<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> @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public ReturnCode filterCell(Cell c) throws IOException {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> if (isEmpty()) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return ReturnCode.INCLUDE;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> ReturnCode rc = ReturnCode.INCLUDE;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> this.seekHintFilters.clear();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Filter filter = filters.get(i);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (filter.filterAllRemaining()) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return ReturnCode.NEXT_ROW;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> ReturnCode localRC;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> localRC = filter.filterCell(c);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> if (localRC == ReturnCode.SEEK_NEXT_USING_HINT) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> seekHintFilters.add(filter);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> rc = mergeReturnCode(rc, localRC);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // Only when rc is INCLUDE* case, we should pass the cell to the following sub-filters.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // otherwise we may mess up the global state (such as offset, count..) in the following<a name="line.181"></a>
+<span class="sourceLineNo">182</span> // sub-filters. (HBASE-20565)<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (!isIncludeRelatedReturnCode(rc)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return rc;<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> if (!seekHintFilters.isEmpty()) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return rc;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> @Override<a name="line.193"></a>
+<span class="sourceLineNo">194</span> public void reset() throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> filters.get(i).reset();<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> seekHintFilters.clear();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public boolean filterRowKey(byte[] rowKey, int offset, int length) throws IOException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> if (isEmpty()) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return super.filterRowKey(rowKey, offset, length);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> boolean retVal = false;<a name="line.206"></a>
+<span class="sourceLineNo">207</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> Filter filter = filters.get(i);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (filter.filterAllRemaining() || filter.filterRowKey(rowKey, offset, length)) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> retVal = true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return retVal;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> @Override<a name="line.216"></a>
+<span class="sourceLineNo">217</span> public boolean filterRowKey(Cell firstRowCell) throws IOException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (isEmpty()) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return super.filterRowKey(firstRowCell);<a name="line.219"></a>
<span class="sourceLineNo">220</span> }<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return retVal;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean filterAllRemaining() throws IOException {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (isEmpty()) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return super.filterAllRemaining();<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (filters.get(i).filterAllRemaining()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> return true;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return false;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> @Override<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public boolean filterRow() throws IOException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (isEmpty()) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return super.filterRow();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Filter filter = filters.get(i);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if (filter.filterRow()) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return true;<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> return false;<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> @Override<a name="line.251"></a>
-<span class="sourceLineNo">252</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (isEmpty()) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return super.getNextCellHint(currentCell);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Cell maxHint = null;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> for (Filter filter : seekHintFilters) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (filter.filterAllRemaining()) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> continue;<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Cell curKeyHint = filter.getNextCellHint(currentCell);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (maxHint == null) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> maxHint = curKeyHint;<a name="line.263"></a>
-<span class="sourceLineNo">264</span> continue;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (this.compareCell(maxHint, curKeyHint) < 0) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> maxHint = curKeyHint;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return maxHint;<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">221</span> boolean retVal = false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> Filter filter = filters.get(i);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (filter.filterAllRemaining() || filter.filterRowKey(firstRowCell)) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Can't just return true here, because there are some filters (such as PrefixFilter) which<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // will catch the row changed event by filterRowKey(). If we return early here, those<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // filters will have no chance to update their row state.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> retVal = true;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return retVal;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
+<span class="sourceLineNo">235</span> public boolean filterAllRemaining() throws IOException {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (isEmpty()) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return super.filterAllRemaining();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (filters.get(i).filterAllRemaining()) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> return true;<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> return false;<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public boolean filterRow() throws IOException {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (isEmpty()) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return super.filterRow();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> Filter filter = filters.get(i);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (filter.filterRow()) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return true;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return false;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> @Override<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> if (isEmpty()) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return super.getNextCellHint(currentCell);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> Cell maxHint = null;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> for (Filter filter : seekHintFilters) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (filter.filterAllRemaining()) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> continue;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span> Cell curKeyHint = filter.getNextCellHint(currentCell);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> if (maxHint == null) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> maxHint = curKeyHint;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> continue;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (this.compareCell(maxHint, curKeyHint) < 0) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> maxHint = curKeyHint;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return maxHint;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>}<a name="line.282"></a>
[03/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html b/testdevapidocs/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
index 6b532bc..37d05cc 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":9,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":9,"i6":10,"i7":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.147">TestColumnRangeFilter</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.149">TestColumnRangeFilter</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -178,30 +178,39 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr id="i0" class="altColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#cellsCount-org.apache.hadoop.hbase.client.Table-org.apache.hadoop.hbase.filter.Filter-">cellsCount</a></span>(org.apache.hadoop.hbase.client.Table table,
+ org.apache.hadoop.hbase.filter.Filter filter)</code> </td>
+</tr>
+<tr id="i1" class="rowColor">
<td class="colFirst"><code>(package private) <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#generateRandomWords-int-int-">generateRandomWords</a></span>(int numberOfWords,
int maxLengthOfWords)</code> </td>
</tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#setUp--">setUp</a></span>()</code> </td>
</tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#setUpBeforeClass--">setUpBeforeClass</a></span>()</code> </td>
</tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#tearDown--">tearDown</a></span>()</code> </td>
</tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#tearDownAfterClass--">tearDownAfterClass</a></span>()</code> </td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#TestColumnRangeFilterClient--">TestColumnRangeFilterClient</a></span>()</code> </td>
</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#TestColumnRangeFilterWithColumnPaginationFilter--">TestColumnRangeFilterWithColumnPaginationFilter</a></span>()</code> </td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -230,7 +239,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.150">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.152">CLASS_RULE</a></pre>
</li>
</ul>
<a name="TEST_UTIL">
@@ -239,7 +248,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>TEST_UTIL</h4>
-<pre>private static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.153">TEST_UTIL</a></pre>
+<pre>private static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.155">TEST_UTIL</a></pre>
</li>
</ul>
<a name="LOG">
@@ -248,7 +257,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.155">LOG</a></pre>
+<pre>private static final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.157">LOG</a></pre>
</li>
</ul>
<a name="name">
@@ -257,7 +266,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>name</h4>
-<pre>public org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.158">name</a></pre>
+<pre>public org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.160">name</a></pre>
</li>
</ul>
</li>
@@ -274,7 +283,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>TestColumnRangeFilter</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.147">TestColumnRangeFilter</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.149">TestColumnRangeFilter</a>()</pre>
</li>
</ul>
</li>
@@ -291,7 +300,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUpBeforeClass</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.161">setUpBeforeClass</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.163">setUpBeforeClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -305,7 +314,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tearDownAfterClass</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.166">tearDownAfterClass</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.168">tearDownAfterClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -319,7 +328,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUp</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.171">setUp</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.173">setUp</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -333,7 +342,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tearDown</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.176">tearDown</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.178">tearDown</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -347,7 +356,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>TestColumnRangeFilterClient</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.181">TestColumnRangeFilterClient</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.183">TestColumnRangeFilterClient</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -355,13 +364,42 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</dl>
</li>
</ul>
+<a name="TestColumnRangeFilterWithColumnPaginationFilter--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TestColumnRangeFilterWithColumnPaginationFilter</h4>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.240">TestColumnRangeFilterWithColumnPaginationFilter</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="cellsCount-org.apache.hadoop.hbase.client.Table-org.apache.hadoop.hbase.filter.Filter-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cellsCount</h4>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.283">cellsCount</a>(org.apache.hadoop.hbase.client.Table table,
+ org.apache.hadoop.hbase.filter.Filter filter)
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
<a name="generateRandomWords-int-int-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>generateRandomWords</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.263">generateRandomWords</a>(int numberOfWords,
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#line.295">generateRandomWords</a>(int numberOfWords,
int maxLengthOfWords)</pre>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 4837d80..ec56445 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -158,8 +158,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TagUsage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TestCacheOnWrite.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TagUsage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/TestMasterTransitions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/TestMasterTransitions.html b/testdevapidocs/org/apache/hadoop/hbase/master/TestMasterTransitions.html
index 584083c..2927274 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/TestMasterTransitions.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/TestMasterTransitions.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterStatusServlet.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/master/TestMasterTransitions.html" target="_top">Frames</a></li>
@@ -500,7 +500,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterStatusServlet.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/master/TestMasterTransitions.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html b/testdevapidocs/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
new file mode 100644
index 0000000..3d741f4
--- /dev/null
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html
@@ -0,0 +1,453 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TestMergeTableRegionsWhileRSCrash (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="TestMergeTableRegionsWhileRSCrash (Apache HBase 3.0.0-SNAPSHOT Test API)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":9,"i1":9,"i2":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestMergeTableRegionsWhileRSCrash.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" target="_top">Frames</a></li>
+<li><a href="TestMergeTableRegionsWhileRSCrash.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.hadoop.hbase.master</div>
+<h2 title="Class TestMergeTableRegionsWhileRSCrash" class="title">Class TestMergeTableRegionsWhileRSCrash</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.52">TestMergeTableRegionsWhileRSCrash</a>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.apache.hadoop.hbase.client.Admin</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#admin">admin</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#CF">CF</a></span></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#LOG">LOG</a></span></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#mergeCommitArrive">mergeCommitArrive</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#SPLITKEY">SPLITKEY</a></span></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.apache.hadoop.hbase.client.Table</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TABLE">TABLE</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static org.apache.hadoop.hbase.TableName</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TABLE_NAME">TABLE_NAME</a></span></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#UTIL">UTIL</a></span></code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TestMergeTableRegionsWhileRSCrash--">TestMergeTableRegionsWhileRSCrash</a></span>()</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#cleanupTest--">cleanupTest</a></span>()</code> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#setupCluster--">setupCluster</a></span>()</code> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#test--">test</a></span>()</code> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/ja
va/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="CLASS_RULE">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CLASS_RULE</h4>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.55">CLASS_RULE</a></pre>
+</li>
+</ul>
+<a name="LOG">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.58">LOG</a></pre>
+</li>
+</ul>
+<a name="UTIL">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UTIL</h4>
+<pre>protected static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.61">UTIL</a></pre>
+</li>
+</ul>
+<a name="TABLE_NAME">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TABLE_NAME</h4>
+<pre>private static org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.62">TABLE_NAME</a></pre>
+</li>
+</ul>
+<a name="admin">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>admin</h4>
+<pre>private static org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.63">admin</a></pre>
+</li>
+</ul>
+<a name="CF">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CF</h4>
+<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.64">CF</a></pre>
+</li>
+</ul>
+<a name="SPLITKEY">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SPLITKEY</h4>
+<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.65">SPLITKEY</a></pre>
+</li>
+</ul>
+<a name="mergeCommitArrive">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mergeCommitArrive</h4>
+<pre>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.66">mergeCommitArrive</a></pre>
+</li>
+</ul>
+<a name="TABLE">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TABLE</h4>
+<pre>private static org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.67">TABLE</a></pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestMergeTableRegionsWhileRSCrash--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestMergeTableRegionsWhileRSCrash</h4>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.52">TestMergeTableRegionsWhileRSCrash</a>()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="setupCluster--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setupCluster</h4>
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.71">setupCluster</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="cleanupTest--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cleanupTest</h4>
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.81">cleanupTest</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="test--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>test</h4>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#line.90">test</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestMergeTableRegionsWhileRSCrash.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" target="_top">Frames</a></li>
+<li><a href="TestMergeTableRegionsWhileRSCrash.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2007–2018 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html b/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html
index 0f3d4bb..f54af40 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -328,7 +328,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html b/testdevapidocs/org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html
new file mode 100644
index 0000000..b311ed8
--- /dev/null
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Uses of Class org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash (Apache HBase 3.0.0-SNAPSHOT Test API)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html" target="_top">Frames</a></li>
+<li><a href="TestMergeTableRegionsWhileRSCrash.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash" class="title">Uses of Class<br>org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash</h2>
+</div>
+<div class="classUseContainer">No usage of org.apache.hadoop.hbase.master.TestMergeTableRegionsWhileRSCrash</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/TestMergeTableRegionsWhileRSCrash.html" target="_top">Frames</a></li>
+<li><a href="TestMergeTableRegionsWhileRSCrash.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2007–2018 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/package-frame.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/package-frame.html b/testdevapidocs/org/apache/hadoop/hbase/master/package-frame.html
index 39bb55e..14ce539 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/package-frame.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/package-frame.html
@@ -62,6 +62,7 @@
<li><a href="TestMasterShutdown.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMasterShutdown</a></li>
<li><a href="TestMasterStatusServlet.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMasterStatusServlet</a></li>
<li><a href="TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMasterTransitions</a></li>
+<li><a href="TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMergeTableRegionsWhileRSCrash</a></li>
<li><a href="TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMetaAssignmentWithStopMaster</a></li>
<li><a href="TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMetaShutdownHandler</a></li>
<li><a href="TestMetaShutdownHandler.MyRegionServer.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMetaShutdownHandler.MyRegionServer</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/package-summary.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/package-summary.html b/testdevapidocs/org/apache/hadoop/hbase/master/package-summary.html
index 8c7b7fc..d0c5771 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/package-summary.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/package-summary.html
@@ -303,111 +303,115 @@
</td>
</tr>
<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></td>
<td class="colLast"> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></td>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master">TestMetaShutdownHandler</a></td>
<td class="colLast">
<div class="block">Tests handling of meta-carrying region server failover.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html" title="class in org.apache.hadoop.hbase.master">TestMetaShutdownHandler.MyRegionServer</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetricsMasterProcSourceImpl.html" title="class in org.apache.hadoop.hbase.master">TestMetricsMasterProcSourceImpl</a></td>
<td class="colLast">
<div class="block">Test for MetricsMasterProcSourceImpl</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetricsMasterSourceFactory.html" title="class in org.apache.hadoop.hbase.master">TestMetricsMasterSourceFactory</a></td>
<td class="colLast">
<div class="block">Test for the CompatibilitySingletonFactory and building MetricsMasterSource</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.html" title="class in org.apache.hadoop.hbase.master">TestMetricsMasterSourceImpl</a></td>
<td class="colLast">
<div class="block">Test for MetricsMasterSourceImpl</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html" title="class in org.apache.hadoop.hbase.master">TestMirroringTableStateManager</a></td>
<td class="colLast">
<div class="block">Tests that table state is mirrored out to zookeeper for hbase-1.x clients.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRegionPlacement.html" title="class in org.apache.hadoop.hbase.master">TestRegionPlacement</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRegionPlacement2.html" title="class in org.apache.hadoop.hbase.master">TestRegionPlacement2</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRegionPlan.html" title="class in org.apache.hadoop.hbase.master">TestRegionPlan</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRegionState.html" title="class in org.apache.hadoop.hbase.master">TestRegionState</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRestartCluster.html" title="class in org.apache.hadoop.hbase.master">TestRestartCluster</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestRollingRestart.html" title="class in org.apache.hadoop.hbase.master">TestRollingRestart</a></td>
<td class="colLast">
<div class="block">Tests the restarting of everything as done during rolling restarts.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureCarryingMetaStuck</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureStuck</a></td>
<td class="colLast">
<div class="block">Testcase for HBASE-20634</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestShutdownBackupMaster.html" title="class in org.apache.hadoop.hbase.master">TestShutdownBackupMaster</a></td>
<td class="colLast">
<div class="block">Test to confirm that we will not hang when stop a backup master which is trying to become the
active master.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestShutdownBackupMaster.MockHMaster.html" title="class in org.apache.hadoop.hbase.master">TestShutdownBackupMaster.MockHMaster</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestShutdownWithNoRegionServer.html" title="class in org.apache.hadoop.hbase.master">TestShutdownWithNoRegionServer</a></td>
<td class="colLast">
<div class="block">Testcase to confirm that we will not hang when shutdown a cluster with no live region servers.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitLogManager.html" title="class in org.apache.hadoop.hbase.master">TestSplitLogManager</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestTableStateManager.html" title="class in org.apache.hadoop.hbase.master">TestTableStateManager</a></td>
<td class="colLast">
<div class="block">Tests the default table lock manager</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/master/TestWarmupRegion.html" title="class in org.apache.hadoop.hbase.master">TestWarmupRegion</a></td>
<td class="colLast">
<div class="block">Run tests that use the HBase clients; <code>HTable</code>.</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 0e9984d..ebbfd85 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -173,6 +173,7 @@
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMasterShutdown.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMasterShutdown</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMasterStatusServlet.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMasterStatusServlet</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMasterTransitions</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMergeTableRegionsWhileRSCrash</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMetaAssignmentWithStopMaster</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMetaShutdownHandler</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/TestMetricsMasterProcSourceImpl.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMetricsMasterProcSourceImpl</span></a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index ed93d3a..541975c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -576,15 +576,15 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index e9c1d93..b5bacb6 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -205,9 +205,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 0fa6cee..7431b74 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -669,9 +669,9 @@
<ul>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index ec4ec49..ff48e4c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 9e0700e..68397c8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -141,9 +141,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/overview-tree.html b/testdevapidocs/overview-tree.html
index 3f8acd0..72a7ab9 100644
--- a/testdevapidocs/overview-tree.html
+++ b/testdevapidocs/overview-tree.html
@@ -2984,6 +2984,7 @@
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.AllocRecord.html" title="class in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMemStoreLAB.AllocRecord</span></a> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestMemstoreLABWithoutPool.html" title="class in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMemstoreLABWithoutPool</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">TestMergeTableRegionsProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMergeTableRegionsWhileRSCrash</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMetaAssignmentWithStopMaster</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestMetaCache.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestMetaCache</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestMetaCache.ExceptionInjector</span></a>
[04/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
index b3b677b..11c182b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
@@ -149,7 +149,7 @@
<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
<span class="sourceLineNo">142</span> * Check whether there is recovered.edits in the closed region<a name="line.142"></a>
<span class="sourceLineNo">143</span> * If any, that means this region is not closed property, we need<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * to abort region merge to prevent data loss<a name="line.144"></a>
+<span class="sourceLineNo">144</span> * to abort region split to prevent data loss<a name="line.144"></a>
<span class="sourceLineNo">145</span> * @param env master env<a name="line.145"></a>
<span class="sourceLineNo">146</span> * @throws IOException IOException<a name="line.146"></a>
<span class="sourceLineNo">147</span> */<a name="line.147"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
index b3b677b..11c182b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
@@ -149,7 +149,7 @@
<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
<span class="sourceLineNo">142</span> * Check whether there is recovered.edits in the closed region<a name="line.142"></a>
<span class="sourceLineNo">143</span> * If any, that means this region is not closed property, we need<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * to abort region merge to prevent data loss<a name="line.144"></a>
+<span class="sourceLineNo">144</span> * to abort region split to prevent data loss<a name="line.144"></a>
<span class="sourceLineNo">145</span> * @param env master env<a name="line.145"></a>
<span class="sourceLineNo">146</span> * @throws IOException IOException<a name="line.146"></a>
<span class="sourceLineNo">147</span> */<a name="line.147"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 12bc7c0..5549cbe 100644
--- a/downloads.html
+++ b/downloads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase Downloads</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -423,7 +423,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 83ce7c1..d856452 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -331,7 +331,7 @@ for more details.</p>
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 1f029d6..b10ab5c 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBaseâ„¢ Home</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -411,7 +411,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index 29fc8da..0d385d9 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – CI Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -291,7 +291,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 697c89e..bd2b3f1 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -288,7 +288,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 1eccf4c..43c76ff 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -491,7 +491,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 342aa6b..08ce1a1 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -341,7 +341,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index c06a5a2..3b66959 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Metrics
@@ -459,7 +459,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index c574590..3b720c3 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Old Apache HBase (TM) News
@@ -440,7 +440,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index 215b8ed..b5841ea 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index a1ae686..1907c0b 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -375,7 +375,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 26a4d74..41e93a6 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Powered By Apache HBase™</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -769,7 +769,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index eb19023..1ede61c 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -335,7 +335,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index a3c214d..1fc413a 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -305,7 +305,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index b76d000..a409387 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index b5c2aad..f66d8ef 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Running Apache HBase (TM) in pseudo-distributed mode
@@ -308,7 +308,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index da10169..a40cd04 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Replication
@@ -303,7 +303,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index 4d4a14a..a858e52 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Other Apache HBase (TM) Resources</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index c4726fd..50a149e 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Source Code Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -299,7 +299,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 3126b2b..37f1941 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase™ Sponsors</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -333,7 +333,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 573e392..41c5196 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Supporting Projects</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -520,7 +520,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 5332f9e..e7100a3 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Team</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -742,7 +742,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/allclasses-frame.html b/testdevapidocs/allclasses-frame.html
index cb60677..00030e9 100644
--- a/testdevapidocs/allclasses-frame.html
+++ b/testdevapidocs/allclasses-frame.html
@@ -1434,6 +1434,7 @@
<li><a href="org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.AllocRecord.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">TestMemStoreLAB.AllocRecord</a></li>
<li><a href="org/apache/hadoop/hbase/regionserver/TestMemstoreLABWithoutPool.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">TestMemstoreLABWithoutPool</a></li>
<li><a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment" target="classFrame">TestMergeTableRegionsProcedure</a></li>
+<li><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMergeTableRegionsWhileRSCrash</a></li>
<li><a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master" target="classFrame">TestMetaAssignmentWithStopMaster</a></li>
<li><a href="org/apache/hadoop/hbase/client/TestMetaCache.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestMetaCache</a></li>
<li><a href="org/apache/hadoop/hbase/client/TestMetaCache.CallQueueTooBigExceptionInjector.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestMetaCache.CallQueueTooBigExceptionInjector</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/allclasses-noframe.html b/testdevapidocs/allclasses-noframe.html
index 969541a..7a1b8b4 100644
--- a/testdevapidocs/allclasses-noframe.html
+++ b/testdevapidocs/allclasses-noframe.html
@@ -1434,6 +1434,7 @@
<li><a href="org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.AllocRecord.html" title="class in org.apache.hadoop.hbase.regionserver">TestMemStoreLAB.AllocRecord</a></li>
<li><a href="org/apache/hadoop/hbase/regionserver/TestMemstoreLABWithoutPool.html" title="class in org.apache.hadoop.hbase.regionserver">TestMemstoreLABWithoutPool</a></li>
<li><a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMergeTableRegionsProcedure</a></li>
+<li><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></li>
<li><a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></li>
<li><a href="org/apache/hadoop/hbase/client/TestMetaCache.html" title="class in org.apache.hadoop.hbase.client">TestMetaCache</a></li>
<li><a href="org/apache/hadoop/hbase/client/TestMetaCache.CallQueueTooBigExceptionInjector.html" title="class in org.apache.hadoop.hbase.client">TestMetaCache.CallQueueTooBigExceptionInjector</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 8cfa174..3b94d3f 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -923,6 +923,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMasterStatusServlet.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMasterStatusServlet.html" title="class in org.apache.hadoop.hbase.master">TestMasterStatusServlet</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestRegionPlacement.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestRegionPlacement.html" title="class in org.apache.hadoop.hbase.master">TestRegionPlacement</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
@@ -3291,6 +3293,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html#cellScanner--">cellScanner()</a></span> - Method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html" title="class in org.apache.hadoop.hbase">TestCellUtil.TestCellScannable</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#cellsCount-org.apache.hadoop.hbase.client.Table-org.apache.hadoop.hbase.filter.Filter-">cellsCount(Table, Filter)</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html" title="class in org.apache.hadoop.hbase.filter">TestColumnRangeFilter</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html#cellsCount">cellsCount</a></span> - Variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html" title="class in org.apache.hadoop.hbase">TestCellUtil.TestCellScannable</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html#cellsCount">cellsCount</a></span> - Variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html" title="class in org.apache.hadoop.hbase">TestCellUtil.TestCellScanner</a></dt>
@@ -3331,6 +3335,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.html#CF">CF</a></span> - Static variable in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.html" title="class in org.apache.hadoop.hbase.master.procedure">TestProcedurePriority</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#CF">CF</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html#CF">CF</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureStuck</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#CF">CF</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
@@ -5165,6 +5171,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMasterTransitions.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master">TestMasterTransitions</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master">TestMetaShutdownHandler</a></dt>
@@ -6727,6 +6735,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.html#cleanupTest--">cleanupTest()</a></span> - Static method in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.html" title="class in org.apache.hadoop.hbase.master.procedure">TestTableDDLProcedureBase</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#cleanupTest--">cleanupTest()</a></span> - Static method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#cleanupTest--">cleanupTest()</a></span> - Static method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure/TestZKProcedure.html#cleanupTest--">cleanupTest()</a></span> - Static method in class org.apache.hadoop.hbase.procedure.<a href="org/apache/hadoop/hbase/procedure/TestZKProcedure.html" title="class in org.apache.hadoop.hbase.procedure">TestZKProcedure</a></dt>
@@ -23536,6 +23546,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMasterTransitions.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMasterTransitions.html" title="class in org.apache.hadoop.hbase.master">TestMasterTransitions</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html" title="class in org.apache.hadoop.hbase.master">TestMetaShutdownHandler</a></dt>
@@ -25106,6 +25118,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestMasterAbortWhileMergingTable.html#mergeCommitArrive">mergeCommitArrive</a></span> - Static variable in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMasterAbortWhileMergingTable.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMasterAbortWhileMergingTable</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#mergeCommitArrive">mergeCommitArrive</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#mergeCommitArrive">mergeCommitArrive</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html#mergeFailedCount">mergeFailedCount</a></span> - Variable in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMergeTableRegionsProcedure</a></dt>
@@ -37838,6 +37852,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.html#setupCluster--">setupCluster()</a></span> - Static method in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.html" title="class in org.apache.hadoop.hbase.master.procedure">TestTableDDLProcedureBase</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#setupCluster--">setupCluster()</a></span> - Static method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#setupCluster--">setupCluster()</a></span> - Static method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.html#setupCluster--">setupCluster()</a></span> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.html" title="class in org.apache.hadoop.hbase.regionserver">TestCompactSplitThread</a></dt>
@@ -39042,6 +39058,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestMasterAbortWhileMergingTable.html#SPLITKEY">SPLITKEY</a></span> - Static variable in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMasterAbortWhileMergingTable.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMasterAbortWhileMergingTable</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#SPLITKEY">SPLITKEY</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/TestHStoreFile.html#SPLITKEY">SPLITKEY</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestHStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">TestHStoreFile</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestTableFavoredNodes.html#splitKeys">splitKeys</a></span> - Variable in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestTableFavoredNodes.html" title="class in org.apache.hadoop.hbase.client">TestTableFavoredNodes</a></dt>
@@ -40544,6 +40562,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/TestRegionLocationFinder.html#table">table</a></span> - Static variable in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/TestRegionLocationFinder.html" title="class in org.apache.hadoop.hbase.master.balancer">TestRegionLocationFinder</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TABLE">TABLE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#TABLE">TABLE</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestWarmupRegion.html#table">table</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestWarmupRegion.html" title="class in org.apache.hadoop.hbase.master">TestWarmupRegion</a></dt>
@@ -40838,6 +40858,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.html#TABLE_NAME">TABLE_NAME</a></span> - Static variable in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.html" title="class in org.apache.hadoop.hbase.master.procedure">TestTableDescriptorModificationFromClient</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TABLE_NAME">TABLE_NAME</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html#TABLE_NAME">TABLE_NAME</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureStuck</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#TABLE_NAME">TABLE_NAME</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestSplitRegionWhileRSCrash</a></dt>
@@ -42666,6 +42688,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.html#test--">test()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.html" title="class in org.apache.hadoop.hbase.master">TestGetLastFlushedSequenceId</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#test--">test()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html#test--">test()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureCarryingMetaStuck</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html#test--">test()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.html" title="class in org.apache.hadoop.hbase.master">TestServerCrashProcedureStuck</a></dt>
@@ -46773,6 +46797,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#TestColumnRangeFilterClient--">TestColumnRangeFilterClient()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html" title="class in org.apache.hadoop.hbase.filter">TestColumnRangeFilter</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html#TestColumnRangeFilterWithColumnPaginationFilter--">TestColumnRangeFilterWithColumnPaginationFilter()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/TestColumnRangeFilter.html" title="class in org.apache.hadoop.hbase.filter">TestColumnRangeFilter</a></dt>
+<dd> </dd>
<dt><a href="org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.html" title="class in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">TestColumnSchemaModel</span></a> - Class in <a href="org/apache/hadoop/hbase/rest/model/package-summary.html">org.apache.hadoop.hbase.rest.model</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.html#TestColumnSchemaModel--">TestColumnSchemaModel()</a></span> - Constructor for class org.apache.hadoop.hbase.rest.model.<a href="org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.html" title="class in org.apache.hadoop.hbase.rest.model">TestColumnSchemaModel</a></dt>
@@ -53882,6 +53908,10 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html#TestMergeTableRegionsProcedure--">TestMergeTableRegionsProcedure()</a></span> - Constructor for class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMergeTableRegionsProcedure</a></dt>
<dd> </dd>
+<dt><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">TestMergeTableRegionsWhileRSCrash</span></a> - Class in <a href="org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#TestMergeTableRegionsWhileRSCrash--">TestMergeTableRegionsWhileRSCrash()</a></span> - Constructor for class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/quotas/TestGlobalQuotaSettingsImpl.html#testMergeThrottle--">testMergeThrottle()</a></span> - Method in class org.apache.hadoop.hbase.quotas.<a href="org/apache/hadoop/hbase/quotas/TestGlobalQuotaSettingsImpl.html" title="class in org.apache.hadoop.hbase.quotas">TestGlobalQuotaSettingsImpl</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/quotas/TestGlobalQuotaSettingsImpl.html#testMergeThrottleAndSpace--">testMergeThrottleAndSpace()</a></span> - Method in class org.apache.hadoop.hbase.quotas.<a href="org/apache/hadoop/hbase/quotas/TestGlobalQuotaSettingsImpl.html" title="class in org.apache.hadoop.hbase.quotas">TestGlobalQuotaSettingsImpl</a></dt>
@@ -66108,6 +66138,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.html" title="class in org.apache.hadoop.hbase.master">TestMasterFileSystemWithWALDir</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html" title="class in org.apache.hadoop.hbase.master">TestMergeTableRegionsWhileRSCrash</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html" title="class in org.apache.hadoop.hbase.master">TestMetaAssignmentWithStopMaster</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestRestartCluster.html#UTIL">UTIL</a></span> - Variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestRestartCluster.html" title="class in org.apache.hadoop.hbase.master">TestRestartCluster</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 6af42fe..2d9b60f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -146,8 +146,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
index 038be6c..1c03b0c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
@@ -3241,62 +3241,66 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMasterCoprocessorServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterCoprocessorServices.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMergeTableRegionsWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestGetLastFlushedSequenceId.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMasterCoprocessorServices.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterCoprocessorServices.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestCatalogJanitor.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestCatalogJanitor.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestGetLastFlushedSequenceId.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestSplitRegionWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestCatalogJanitor.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestCatalogJanitor.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestHMasterCommandLine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestHMasterCommandLine.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestSplitRegionWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestDLSAsyncFSWAL.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestHMasterCommandLine.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestHMasterCommandLine.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestServerCrashProcedureCarryingMetaStuck.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestDLSAsyncFSWAL.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMaster.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMaster.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestServerCrashProcedureCarryingMetaStuck.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMasterOperationsForRegionReplicas.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMaster.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMaster.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestGetReplicationLoad.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestGetReplicationLoad.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMasterOperationsForRegionReplicas.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMasterBalanceThrottling.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestGetReplicationLoad.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestGetReplicationLoad.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMasterFileSystemWithWALDir.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMasterBalanceThrottling.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMetaAssignmentWithStopMaster.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMasterFileSystemWithWALDir.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestMirroringTableStateManager.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMetaAssignmentWithStopMaster.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestMirroringTableStateManager.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestMasterMetricsWrapper.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
index 5c1c79a..a20552e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
@@ -2068,17 +2068,21 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>protected static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestSplitRegionWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#UTIL">UTIL</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">TestMergeTableRegionsWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.html#UTIL">UTIL</a></span></code> </td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>protected static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestSplitRegionWhileRSCrash.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.html#UTIL">UTIL</a></span></code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>private static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestServerCrashProcedureCarryingMetaStuck.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.html#UTIL">UTIL</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestMasterFileSystemWithWALDir.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.html#UTIL">UTIL</a></span></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestMetaAssignmentWithStopMaster.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.html#UTIL">UTIL</a></span></code> </td>
</tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/org/apache/hadoop/hbase/filter/StringRange.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/filter/StringRange.html b/testdevapidocs/org/apache/hadoop/hbase/filter/StringRange.html
index da5fdb9..a1bdd6b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/filter/StringRange.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/filter/StringRange.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.57">StringRange</a>
+<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.59">StringRange</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -240,7 +240,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>start</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.58">start</a></pre>
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.60">start</a></pre>
</li>
</ul>
<a name="end">
@@ -249,7 +249,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>end</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.59">end</a></pre>
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.61">end</a></pre>
</li>
</ul>
<a name="startInclusive">
@@ -258,7 +258,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>startInclusive</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.60">startInclusive</a></pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.62">startInclusive</a></pre>
</li>
</ul>
<a name="endInclusive">
@@ -267,7 +267,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>endInclusive</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.61">endInclusive</a></pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.63">endInclusive</a></pre>
</li>
</ul>
</li>
@@ -284,7 +284,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>StringRange</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.63">StringRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> start,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.65">StringRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> start,
boolean startInclusive,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> end,
boolean endInclusive)</pre>
@@ -304,7 +304,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getStart</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.71">getStart</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.73">getStart</a>()</pre>
</li>
</ul>
<a name="getEnd--">
@@ -313,7 +313,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getEnd</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.75">getEnd</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.77">getEnd</a>()</pre>
</li>
</ul>
<a name="isStartInclusive--">
@@ -322,7 +322,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>isStartInclusive</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.79">isStartInclusive</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.81">isStartInclusive</a>()</pre>
</li>
</ul>
<a name="isEndInclusive--">
@@ -331,7 +331,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>isEndInclusive</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.83">isEndInclusive</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.85">isEndInclusive</a>()</pre>
</li>
</ul>
<a name="hashCode--">
@@ -340,7 +340,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.88">hashCode</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.90">hashCode</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -353,7 +353,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.101">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> obj)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.103">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> obj)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -366,7 +366,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.119">toString</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.121">toString</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -379,7 +379,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>inRange</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.127">inRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/StringRange.html#line.129">inRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</pre>
</li>
</ul>
</li>
[11/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
Published site at a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/88a2fa46
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/88a2fa46
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/88a2fa46
Branch: refs/heads/asf-site
Commit: 88a2fa46405dac4da496d056b2b8b06c5fc1df08
Parents: 26189c7
Author: jenkins <bu...@apache.org>
Authored: Tue Jul 24 14:50:10 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Tue Jul 24 14:50:10 2018 +0000
----------------------------------------------------------------------
acid-semantics.html | 4 +-
apache_hbase_reference_guide.pdf | 4 +-
.../hadoop/hbase/filter/ColumnRangeFilter.html | 4 +-
.../hadoop/hbase/filter/ColumnRangeFilter.html | 55 +-
book.html | 2 +-
bulk-loads.html | 4 +-
checkstyle-aggregate.html | 26300 ++++++++---------
checkstyle.rss | 20 +-
coc.html | 4 +-
dependencies.html | 4 +-
dependency-convergence.html | 4 +-
dependency-info.html | 4 +-
dependency-management.html | 4 +-
devapidocs/constant-values.html | 6 +-
devapidocs/index-all.html | 14 +-
.../hadoop/hbase/backup/package-tree.html | 4 +-
.../hbase/client/class-use/RegionInfo.html | 141 +-
.../hadoop/hbase/client/package-tree.html | 22 +-
.../hadoop/hbase/executor/package-tree.html | 2 +-
.../hadoop/hbase/filter/ColumnRangeFilter.html | 10 +-
.../hadoop/hbase/filter/FilterListWithAND.html | 31 +-
.../filter/class-use/Filter.ReturnCode.html | 16 +-
.../hadoop/hbase/filter/package-tree.html | 10 +-
.../hadoop/hbase/io/hfile/package-tree.html | 6 +-
.../apache/hadoop/hbase/ipc/package-tree.html | 4 +-
.../hadoop/hbase/mapreduce/package-tree.html | 4 +-
.../assignment/MergeTableRegionsProcedure.html | 205 +-
.../assignment/SplitTableRegionProcedure.html | 4 +-
.../hadoop/hbase/master/package-tree.html | 6 +-
.../procedure/class-use/MasterProcedureEnv.html | 15 +
.../hbase/master/procedure/package-tree.html | 4 +-
.../org/apache/hadoop/hbase/package-tree.html | 16 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/quotas/package-tree.html | 4 +-
.../hadoop/hbase/regionserver/package-tree.html | 16 +-
.../regionserver/querymatcher/package-tree.html | 2 +-
.../hbase/regionserver/wal/package-tree.html | 2 +-
.../replication/regionserver/package-tree.html | 2 +-
.../hbase/security/access/package-tree.html | 2 +-
.../hadoop/hbase/security/package-tree.html | 4 +-
.../hadoop/hbase/thrift/package-tree.html | 2 +-
.../apache/hadoop/hbase/util/package-tree.html | 8 +-
.../apache/hadoop/hbase/wal/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/Version.html | 6 +-
.../hadoop/hbase/filter/ColumnRangeFilter.html | 55 +-
.../hadoop/hbase/filter/FilterListWithAND.html | 240 +-
.../assignment/MergeTableRegionsProcedure.html | 1155 +-
...tTableRegionProcedure.StoreFileSplitter.html | 2 +-
.../assignment/SplitTableRegionProcedure.html | 2 +-
downloads.html | 4 +-
export_control.html | 4 +-
index.html | 4 +-
integration.html | 4 +-
issue-tracking.html | 4 +-
license.html | 4 +-
mail-lists.html | 4 +-
metrics.html | 4 +-
old_news.html | 4 +-
plugin-management.html | 4 +-
plugins.html | 4 +-
poweredbyhbase.html | 4 +-
project-info.html | 4 +-
project-reports.html | 4 +-
project-summary.html | 4 +-
pseudo-distributed.html | 4 +-
replication.html | 4 +-
resources.html | 4 +-
source-repository.html | 4 +-
sponsors.html | 4 +-
supportingprojects.html | 4 +-
team-list.html | 4 +-
testdevapidocs/allclasses-frame.html | 1 +
testdevapidocs/allclasses-noframe.html | 1 +
testdevapidocs/index-all.html | 32 +
.../hadoop/hbase/backup/package-tree.html | 2 +-
.../hbase/class-use/HBaseClassTestRule.html | 32 +-
.../hbase/class-use/HBaseTestingUtility.html | 10 +-
.../apache/hadoop/hbase/filter/StringRange.html | 28 +-
.../hbase/filter/TestColumnRangeFilter.html | 74 +-
.../hadoop/hbase/io/hfile/package-tree.html | 2 +-
.../hbase/master/TestMasterTransitions.html | 4 +-
.../TestMergeTableRegionsWhileRSCrash.html | 453 +
.../TestMetaAssignmentWithStopMaster.html | 4 +-
.../TestMergeTableRegionsWhileRSCrash.html | 125 +
.../hadoop/hbase/master/package-frame.html | 1 +
.../hadoop/hbase/master/package-summary.html | 46 +-
.../hadoop/hbase/master/package-tree.html | 1 +
.../org/apache/hadoop/hbase/package-tree.html | 12 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/regionserver/package-tree.html | 2 +-
.../apache/hadoop/hbase/test/package-tree.html | 4 +-
.../apache/hadoop/hbase/wal/package-tree.html | 2 +-
testdevapidocs/overview-tree.html | 1 +
.../apache/hadoop/hbase/filter/StringRange.html | 528 +-
.../hbase/filter/TestColumnRangeFilter.html | 528 +-
.../TestFilterList.AlwaysNextColFilter.html | 8 +-
.../hbase/filter/TestFilterList.MockFilter.html | 8 +-
.../TestFilterList.MockNextRowFilter.html | 8 +-
.../TestFilterList.MockSeekHintFilter.html | 8 +-
.../filter/TestFilterList.TransformFilter.html | 8 +-
.../hadoop/hbase/filter/TestFilterList.html | 8 +-
.../TestMergeTableRegionsWhileRSCrash.html | 202 +
102 files changed, 15853 insertions(+), 14819 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index da73d56..5b8e845 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) ACID Properties
@@ -601,7 +601,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 1f36b4a..012c7d4 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.alpha.15, based on Prawn 2.2.2)
/Producer (Apache HBase Team)
-/ModDate (D:20180723142952+00'00')
-/CreationDate (D:20180723144629+00'00')
+/ModDate (D:20180724143039+00'00')
+/CreationDate (D:20180724144639+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/apidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/apidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
index 6ae7044..11f84eb 100644
--- a/apidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
+++ b/apidocs/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
@@ -634,7 +634,7 @@ public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.Return
<ul class="blockList">
<li class="blockList">
<h4>getNextCellHint</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.228">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> cell)</pre>
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.231">getNextCellHint</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a> cell)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code>org.apache.hadoop.hbase.filter.FilterBase</code></span></div>
<div class="block">Filters that are not sure which key must be next seeked to, can inherit
this implementation that, by default, returns a null Cell.
@@ -660,7 +660,7 @@ public <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.Return
<ul class="blockListLast">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.233">toString</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html#line.236">toString</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code>org.apache.hadoop.hbase.filter.FilterBase</code></span></div>
<div class="block">Return filter's info for debugging and logging purpose.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
index 63c6279..a659033 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
@@ -216,35 +216,38 @@
<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> /**<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param other<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @return true if and only if the fields of the filter that are serialized<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.213"></a>
+<span class="sourceLineNo">211</span> * @param o filter to serialize.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * corresponding fields in other. Used for testing.<a name="line.213"></a>
<span class="sourceLineNo">214</span> */<a name="line.214"></a>
<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
<span class="sourceLineNo">216</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> if (o == this) return true;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.221"></a>
-<span class="sourceLineNo">222</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.222"></a>
-<span class="sourceLineNo">223</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.223"></a>
-<span class="sourceLineNo">224</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> @Override<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public Cell getNextCellHint(Cell cell) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> @Override<a name="line.232"></a>
-<span class="sourceLineNo">233</span> public String toString() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return this.getClass().getSimpleName() + " "<a name="line.234"></a>
-<span class="sourceLineNo">235</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.235"></a>
-<span class="sourceLineNo">236</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.236"></a>
-<span class="sourceLineNo">237</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>}<a name="line.239"></a>
+<span class="sourceLineNo">217</span> if (o == this) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return true;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (!(o instanceof ColumnRangeFilter)) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> ColumnRangeFilter other = (ColumnRangeFilter) o;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return Bytes.equals(this.getMinColumn(), other.getMinColumn())<a name="line.224"></a>
+<span class="sourceLineNo">225</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.225"></a>
+<span class="sourceLineNo">226</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.226"></a>
+<span class="sourceLineNo">227</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public Cell getNextCellHint(Cell cell) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public String toString() {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return this.getClass().getSimpleName() + " "<a name="line.237"></a>
+<span class="sourceLineNo">238</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.238"></a>
+<span class="sourceLineNo">239</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.239"></a>
+<span class="sourceLineNo">240</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>}<a name="line.242"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index f4edafd..69791ab 100644
--- a/book.html
+++ b/book.html
@@ -40819,7 +40819,7 @@ org/apache/hadoop/hbase/security/access/AccessControlClient.revoke:(Lorg/apache/
<div id="footer">
<div id="footer-text">
Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-07-23 14:29:52 UTC
+Last updated 2018-07-24 14:30:39 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index eaa71cd..2c3d5bd 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-07-23</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-07-24</li>
</p>
</div>
[10/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 17ff9c0..d0a915f 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180723" />
+ <meta name="Date-Revision-yyyymmdd" content="20180724" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Checkstyle Results</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -281,10 +281,10 @@
<th><img src="images/icon_warning_sml.gif" alt="" /> Warnings</th>
<th><img src="images/icon_error_sml.gif" alt="" /> Errors</th></tr>
<tr class="b">
-<td>3691</td>
+<td>3692</td>
<td>0</td>
<td>0</td>
-<td>15670</td></tr></table></div>
+<td>15659</td></tr></table></div>
<div class="section">
<h2><a name="Files"></a>Files</h2>
<table border="0" class="table table-striped">
@@ -2632,7 +2632,7 @@
<td><a href="#org.apache.hadoop.hbase.filter.ColumnRangeFilter.java">org/apache/hadoop/hbase/filter/ColumnRangeFilter.java</a></td>
<td>0</td>
<td>0</td>
-<td>22</td></tr>
+<td>11</td></tr>
<tr class="b">
<td><a href="#org.apache.hadoop.hbase.filter.CompareFilter.java">org/apache/hadoop/hbase/filter/CompareFilter.java</a></td>
<td>0</td>
@@ -9834,7 +9834,7 @@
<tr class="a">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_blocks.html#NeedBraces">NeedBraces</a></td>
-<td>1865</td>
+<td>1863</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td>coding</td>
@@ -9916,19 +9916,19 @@
<li>caseIndent: <tt>"2"</tt></li>
<li>basicOffset: <tt>"2"</tt></li>
<li>lineWrappingIndentation: <tt>"2"</tt></li></ul></td>
-<td>4997</td>
+<td>4990</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td>javadoc</td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>772</td>
+<td>771</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3645</td>
+<td>3644</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td>misc</td>
@@ -38013,221 +38013,155 @@
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>198</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
-<td>At-clause should have a non-empty description.</td>
-<td>211</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>javadoc</td>
-<td>JavadocTagContinuationIndentation</td>
-<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>213</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>217</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'if' has incorrect indentation level 3, expected level should be 4.</td>
-<td>217</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>218</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'if' has incorrect indentation level 3, expected level should be 4.</td>
-<td>218</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def' child has incorrect indentation level 3, expected level should be 4.</td>
-<td>220</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def' child has incorrect indentation level 3, expected level should be 4.</td>
-<td>221</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def' child has incorrect indentation level 5, expected level should be 6.</td>
-<td>222</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def' child has incorrect indentation level 5, expected level should be 6.</td>
-<td>223</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def' child has incorrect indentation level 5, expected level should be 6.</td>
-<td>224</td></tr></table></div>
+<td>198</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.CompareFilter.java">org/apache/hadoop/hbase/filter/CompareFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>136</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>159</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>182</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>207</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>231</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>232</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>233</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>234</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>235</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>236</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>237</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>238</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>239</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>240</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>241</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>242</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>243</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>244</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>279</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>297</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>303</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>305</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>309</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -38236,85 +38170,85 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.DependentColumnFilter.java">org/apache/hadoop/hbase/filter/DependentColumnFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>31</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>34</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>70</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>158</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 6.</td>
<td>169</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>172</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>258</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>262</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'CompareOperator' has incorrect indentation level 4, expected level should be 6.</td>
<td>270</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>286</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>288</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>294</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -38323,79 +38257,79 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FamilyFilter.java">org/apache/hadoop/hbase/filter/FamilyFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>28</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException' import.</td>
<td>31</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 144).</td>
<td>39</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 116).</td>
<td>44</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>56</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>75</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>113</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>117</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>139</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>143</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>144</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
@@ -38404,37 +38338,37 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.Filter.java">org/apache/hadoop/hbase/filter/Filter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>27</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 101).</td>
<td>41</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'enum def rcurly' has incorrect indentation level 0, expected level should be 2.</td>
<td>221</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>300</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
@@ -38443,19 +38377,19 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterAllFilter.java">org/apache/hadoop/hbase/filter/FilterAllFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>57</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -38464,31 +38398,31 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterBase.java">org/apache/hadoop/hbase/filter/FilterBase.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>61</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>67</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>176</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
@@ -38497,49 +38431,49 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterList.java">org/apache/hadoop/hbase/filter/FilterList.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>88</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>168</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>215</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>239</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>245</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -38548,13 +38482,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterListBase.java">org/apache/hadoop/hbase/filter/FilterListBase.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
@@ -38563,73 +38497,73 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterListWithAND.java">org/apache/hadoop/hbase/filter/FilterListWithAND.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'java.io.IOException' import.</td>
<td>25</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 133).</td>
<td>74</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>83</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>84</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>85</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>86</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>87</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>88</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>89</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 198).</td>
<td>90</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
@@ -38638,601 +38572,601 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterListWithOR.java">org/apache/hadoop/hbase/filter/FilterListWithOR.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'java.io.IOException' import.</td>
<td>27</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>92</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>93</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>94</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>95</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>96</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>97</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>98</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>99</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>102</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>103</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>104</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>106</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>107</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>108</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 133).</td>
<td>122</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 170).</td>
<td>131</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 157).</td>
<td>132</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 157).</td>
<td>133</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 157).</td>
<td>134</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 154).</td>
<td>135</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 154).</td>
<td>136</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 154).</td>
<td>137</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 170).</td>
<td>138</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>147</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>149</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>150</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>151</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>152</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>154</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>155</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>156</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>158</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>159</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>160</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>161</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>162</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>164</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>165</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>166</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>167</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>168</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>169</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>170</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>171</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>172</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>173</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>174</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>176</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>177</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>178</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>180</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>181</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>182</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>183</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>184</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>185</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>186</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>187</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>188</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>189</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>190</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>192</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>193</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>194</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>195</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>196</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>197</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>198</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>199</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>200</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>201</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>202</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>203</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>204</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>205</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>206</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>207</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>208</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>209</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>210</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>211</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>212</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>213</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>214</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>215</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>216</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child has incorrect indentation level 6, expected level should be 8.</td>
<td>217</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'case' child has incorrect indentation level 4, expected level should be 6.</td>
<td>218</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>219</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>221</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>222</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>223</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>224</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>225</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 6, expected level should be 8.</td>
<td>226</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 10.</td>
<td>227</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' has incorrect indentation level 6, expected level should be 8.</td>
<td>228</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
@@ -39241,13 +39175,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterTestingCluster.java">org/apache/hadoop/hbase/filter/FilterTestingCluster.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>design</td>
<td>HideUtilityClassConstructor</td>
@@ -39256,79 +39190,79 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FilterWrapper.java">org/apache/hadoop/hbase/filter/FilterWrapper.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>27</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException' import.</td>
<td>30</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>ParenPad</td>
<td>'(' is followed by whitespace.</td>
<td>43</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>ParenPad</td>
<td>')' is preceded with whitespace.</td>
<td>43</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>65</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>69</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>106</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>112</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>116</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>173</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>177</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39337,61 +39271,61 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter.java">org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>26</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hbase.thirdparty.com.google.common.base.Preconditions' import.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>55</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>63</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>102</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>106</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>120</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>124</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39400,67 +39334,67 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FirstKeyValueMatchingQualifiersFilter.java">org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>27</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>63</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>96</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 102).</td>
<td>103</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>104</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>108</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>126</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>130</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39469,127 +39403,127 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.FuzzyRowFilter.java">org/apache/hadoop/hbase/filter/FuzzyRowFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>30</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>35</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 120).</td>
<td>84</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>122</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>130</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>150</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' has incorrect indentation level 16, expected level should be one of the following: 10, 12.</td>
<td>208</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 18, expected level should be one of the following: 12, 14.</td>
<td>211</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' has incorrect indentation level 16, expected level should be one of the following: 10, 12.</td>
<td>213</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'object def rcurly' has incorrect indentation level 14, expected level should be one of the following: 8, 10.</td>
<td>214</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 107).</td>
<td>220</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 114).</td>
<td>243</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>281</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>610</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>611</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>620</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>622</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>634</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>635</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39598,85 +39532,85 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.InclusiveStopFilter.java">org/apache/hadoop/hbase/filter/InclusiveStopFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>27</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>31</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>54</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>62</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>69</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 103).</td>
<td>70</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>80</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>94</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>102</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>106</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>119</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>123</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39685,55 +39619,55 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.KeyOnlyFilter.java">org/apache/hadoop/hbase/filter/KeyOnlyFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>LeftCurly</td>
<td>'{' at column 26 should have line break after.</td>
<td>51</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>LeftCurly</td>
<td>'{' at column 42 should have line break after.</td>
<td>52</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>73</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>108</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>112</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>125</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>129</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39742,157 +39676,157 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.LongComparator.java">org/apache/hadoop/hbase/filter/LongComparator.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.yetus.audience.InterfaceAudience' import.</td>
<td>25</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>26</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.ByteBufferUtils' import.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
<td>61</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>63</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>65</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>66</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
<td>67</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>72</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
<td>75</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>77</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'try' has incorrect indentation level 8, expected level should be 4.</td>
<td>78</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'try' child has incorrect indentation level 12, expected level should be 6.</td>
<td>79</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'try rcurly' has incorrect indentation level 8, expected level should be 4.</td>
<td>80</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'catch' child has incorrect indentation level 12, expected level should be 6.</td>
<td>81</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'catch rcurly' has incorrect indentation level 8, expected level should be 4.</td>
<td>82</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>83</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
<td>84</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>87</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>89</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
<td>91</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>92</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' has incorrect indentation level 8, expected level should be 4.</td>
<td>92</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
<td>93</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
@@ -39901,67 +39835,67 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.MultiRowRangeFilter.java">org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>33</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>81</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>128</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>156</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>159</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>171</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>200</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>202</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -39970,97 +39904,97 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.MultipleColumnPrefixFilter.java">org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>29</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.util.Bytes' import.</td>
<td>33</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>49</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>50</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>70</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>126</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>134</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>138</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>157</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>161</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>162</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>176</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>177</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>178</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
@@ -40069,55 +40003,55 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.NullComparator.java">org/apache/hadoop/hbase/filter/NullComparator.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.exceptions.DeserializationException' import.</td>
<td>25</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException' import.</td>
<td>28</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>81</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
<td>85</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>96</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
<td>98</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>102</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -40126,31 +40060,31 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.PageFilter.java">org/apache/hadoop/hbase/filter/PageFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>65</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
<td>69</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>117</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
@@ -40159,13 +40093,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.ParseConstants.java">org/apache/hadoop/hbase/filter/ParseConstants.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>design</td>
<td>HideUtilityClassConstructor</td>
@@ -40174,289 +40108,289 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.filter.ParseFilter.java">org/apache/hadoop/hbase/filter/ParseFilter.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.filter.CompareFilter.CompareOp' import.</td>
<td>38</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>113</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>124</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child has incorrect indentation level 8, expected level should be 6.</td>
<td>191</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>214</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>ParenPad</td>
<td>')' is preceded with whitespace.</td>
<td>227</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>243</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>276</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>304</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>392</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>487</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>525</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>551</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>578</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>MethodParamPad</td>
<td>'(' is preceded with whitespace.</td>
<td>608</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace
<TRUNCATED>
[05/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
index 9050c69..dd41a30 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
@@ -227,7 +227,7 @@
<span class="sourceLineNo">219</span><a name="line.219"></a>
<span class="sourceLineNo">220</span> @Override<a name="line.220"></a>
<span class="sourceLineNo">221</span> protected Flow executeFromState(final MasterProcedureEnv env,<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final MergeTableRegionsState state) {<a name="line.222"></a>
+<span class="sourceLineNo">222</span> MergeTableRegionsState state) {<a name="line.222"></a>
<span class="sourceLineNo">223</span> LOG.trace("{} execute state={}", this, state);<a name="line.223"></a>
<span class="sourceLineNo">224</span> try {<a name="line.224"></a>
<span class="sourceLineNo">225</span> switch (state) {<a name="line.225"></a>
@@ -244,581 +244,614 @@
<span class="sourceLineNo">236</span> break;<a name="line.236"></a>
<span class="sourceLineNo">237</span> case MERGE_TABLE_REGIONS_CLOSE_REGIONS:<a name="line.237"></a>
<span class="sourceLineNo">238</span> addChildProcedure(createUnassignProcedures(env, getRegionReplication(env)));<a name="line.238"></a>
-<span class="sourceLineNo">239</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_CREATE_MERGED_REGION);<a name="line.239"></a>
+<span class="sourceLineNo">239</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_CHECK_CLOSED_REGIONS);<a name="line.239"></a>
<span class="sourceLineNo">240</span> break;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> case MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.241"></a>
-<span class="sourceLineNo">242</span> createMergedRegion(env);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE);<a name="line.243"></a>
+<span class="sourceLineNo">241</span> case MERGE_TABLE_REGIONS_CHECK_CLOSED_REGIONS:<a name="line.241"></a>
+<span class="sourceLineNo">242</span> checkClosedRegions(env);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_CREATE_MERGED_REGION);<a name="line.243"></a>
<span class="sourceLineNo">244</span> break;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> case MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE:<a name="line.245"></a>
-<span class="sourceLineNo">246</span> writeMaxSequenceIdFile(env);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION);<a name="line.247"></a>
+<span class="sourceLineNo">245</span> case MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.245"></a>
+<span class="sourceLineNo">246</span> createMergedRegion(env);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE);<a name="line.247"></a>
<span class="sourceLineNo">248</span> break;<a name="line.248"></a>
-<span class="sourceLineNo">249</span> case MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.249"></a>
-<span class="sourceLineNo">250</span> preMergeRegionsCommit(env);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_UPDATE_META);<a name="line.251"></a>
+<span class="sourceLineNo">249</span> case MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE:<a name="line.249"></a>
+<span class="sourceLineNo">250</span> writeMaxSequenceIdFile(env);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION);<a name="line.251"></a>
<span class="sourceLineNo">252</span> break;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.253"></a>
-<span class="sourceLineNo">254</span> updateMetaForMergedRegions(env);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION);<a name="line.255"></a>
+<span class="sourceLineNo">253</span> case MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.253"></a>
+<span class="sourceLineNo">254</span> preMergeRegionsCommit(env);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_UPDATE_META);<a name="line.255"></a>
<span class="sourceLineNo">256</span> break;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.257"></a>
-<span class="sourceLineNo">258</span> postMergeRegionsCommit(env);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_OPEN_MERGED_REGION);<a name="line.259"></a>
+<span class="sourceLineNo">257</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.257"></a>
+<span class="sourceLineNo">258</span> updateMetaForMergedRegions(env);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION);<a name="line.259"></a>
<span class="sourceLineNo">260</span> break;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.261"></a>
-<span class="sourceLineNo">262</span> addChildProcedure(createAssignProcedures(env, getRegionReplication(env)));<a name="line.262"></a>
-<span class="sourceLineNo">263</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_POST_OPERATION);<a name="line.263"></a>
+<span class="sourceLineNo">261</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.261"></a>
+<span class="sourceLineNo">262</span> postMergeRegionsCommit(env);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_OPEN_MERGED_REGION);<a name="line.263"></a>
<span class="sourceLineNo">264</span> break;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.265"></a>
-<span class="sourceLineNo">266</span> postCompletedMergeRegions(env);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> return Flow.NO_MORE_STATE;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> default:<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> } catch (IOException e) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> String msg = "Error trying to merge regions " +<a name="line.272"></a>
-<span class="sourceLineNo">273</span> RegionInfo.getShortNameToLog(regionsToMerge) + " in the table " + getTableName() +<a name="line.273"></a>
-<span class="sourceLineNo">274</span> " (in state=" + state + ")";<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (!isRollbackSupported(state)) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> // We reach a state that cannot be rolled back. We just need to keep retrying.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> LOG.warn(msg, e);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> LOG.error(msg, e);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> setFailure("master-merge-regions", e);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return Flow.HAS_MORE_STATE;<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> /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * To rollback {@link MergeTableRegionsProcedure}, two AssignProcedures are asynchronously<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * submitted for each region to be merged (rollback doesn't wait on the completion of the<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * AssignProcedures) . This can be improved by changing rollback() to support sub-procedures.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * See HBASE-19851 for details.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> */<a name="line.291"></a>
-<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span> protected void rollbackState(final MasterProcedureEnv env, final MergeTableRegionsState state)<a name="line.293"></a>
-<span class="sourceLineNo">294</span> throws IOException {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (isTraceEnabled()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> LOG.trace(this + " rollback state=" + state);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> try {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> switch (state) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.301"></a>
-<span class="sourceLineNo">302</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.302"></a>
-<span class="sourceLineNo">303</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.303"></a>
-<span class="sourceLineNo">304</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.304"></a>
-<span class="sourceLineNo">305</span> String msg = this + " We are in the " + state + " state." +<a name="line.305"></a>
-<span class="sourceLineNo">306</span> " It is complicated to rollback the merge operation that region server is working on." +<a name="line.306"></a>
-<span class="sourceLineNo">307</span> " Rollback is not supported and we should let the merge operation to complete";<a name="line.307"></a>
-<span class="sourceLineNo">308</span> LOG.warn(msg);<a name="line.308"></a>
-<span class="sourceLineNo">309</span> // PONR<a name="line.309"></a>
-<span class="sourceLineNo">310</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> case MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.311"></a>
-<span class="sourceLineNo">312</span> break;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> case MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.313"></a>
-<span class="sourceLineNo">314</span> case MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE:<a name="line.314"></a>
-<span class="sourceLineNo">315</span> cleanupMergedRegion(env);<a name="line.315"></a>
+<span class="sourceLineNo">265</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.265"></a>
+<span class="sourceLineNo">266</span> addChildProcedure(createAssignProcedures(env, getRegionReplication(env)));<a name="line.266"></a>
+<span class="sourceLineNo">267</span> setNextState(MergeTableRegionsState.MERGE_TABLE_REGIONS_POST_OPERATION);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> break;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.269"></a>
+<span class="sourceLineNo">270</span> postCompletedMergeRegions(env);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return Flow.NO_MORE_STATE;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> default:<a name="line.272"></a>
+<span class="sourceLineNo">273</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } catch (IOException e) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> String msg = "Error trying to merge regions " +<a name="line.276"></a>
+<span class="sourceLineNo">277</span> RegionInfo.getShortNameToLog(regionsToMerge) + " in the table " + getTableName() +<a name="line.277"></a>
+<span class="sourceLineNo">278</span> " (in state=" + state + ")";<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (!isRollbackSupported(state)) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> // We reach a state that cannot be rolled back. We just need to keep retrying.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> LOG.warn(msg, e);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> } else {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> LOG.error(msg, e);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> setFailure("master-merge-regions", e);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return Flow.HAS_MORE_STATE;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> /**<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * To rollback {@link MergeTableRegionsProcedure}, two AssignProcedures are asynchronously<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * submitted for each region to be merged (rollback doesn't wait on the completion of the<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * AssignProcedures) . This can be improved by changing rollback() to support sub-procedures.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * See HBASE-19851 for details.<a name="line.294"></a>
+<span class="sourceLineNo">295</span> */<a name="line.295"></a>
+<span class="sourceLineNo">296</span> @Override<a name="line.296"></a>
+<span class="sourceLineNo">297</span> protected void rollbackState(final MasterProcedureEnv env, final MergeTableRegionsState state)<a name="line.297"></a>
+<span class="sourceLineNo">298</span> throws IOException {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> if (isTraceEnabled()) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> LOG.trace(this + " rollback state=" + state);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span> try {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> switch (state) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.305"></a>
+<span class="sourceLineNo">306</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.306"></a>
+<span class="sourceLineNo">307</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.307"></a>
+<span class="sourceLineNo">308</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.308"></a>
+<span class="sourceLineNo">309</span> String msg = this + " We are in the " + state + " state." +<a name="line.309"></a>
+<span class="sourceLineNo">310</span> " It is complicated to rollback the merge operation that region server is working on." +<a name="line.310"></a>
+<span class="sourceLineNo">311</span> " Rollback is not supported and we should let the merge operation to complete";<a name="line.311"></a>
+<span class="sourceLineNo">312</span> LOG.warn(msg);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> // PONR<a name="line.313"></a>
+<span class="sourceLineNo">314</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> case MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.315"></a>
<span class="sourceLineNo">316</span> break;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> case MERGE_TABLE_REGIONS_CLOSE_REGIONS:<a name="line.317"></a>
-<span class="sourceLineNo">318</span> rollbackCloseRegionsForMerge(env);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> break;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> case MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION:<a name="line.320"></a>
-<span class="sourceLineNo">321</span> postRollBackMergeRegions(env);<a name="line.321"></a>
+<span class="sourceLineNo">317</span> case MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.317"></a>
+<span class="sourceLineNo">318</span> case MERGE_TABLE_REGIONS_WRITE_MAX_SEQUENCE_ID_FILE:<a name="line.318"></a>
+<span class="sourceLineNo">319</span> cleanupMergedRegion(env);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> break;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> case MERGE_TABLE_REGIONS_CHECK_CLOSED_REGIONS:<a name="line.321"></a>
<span class="sourceLineNo">322</span> break;<a name="line.322"></a>
-<span class="sourceLineNo">323</span> case MERGE_TABLE_REGIONS_PREPARE:<a name="line.323"></a>
-<span class="sourceLineNo">324</span> break;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> default:<a name="line.325"></a>
-<span class="sourceLineNo">326</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } catch (Exception e) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> // This will be retried. Unless there is a bug in the code,<a name="line.329"></a>
-<span class="sourceLineNo">330</span> // this should be just a "temporary error" (e.g. network down)<a name="line.330"></a>
-<span class="sourceLineNo">331</span> LOG.warn("Failed rollback attempt step " + state + " for merging the regions "<a name="line.331"></a>
-<span class="sourceLineNo">332</span> + RegionInfo.getShortNameToLog(regionsToMerge) + " in table " + getTableName(), e);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> throw e;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> /*<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * Check whether we are in the state that can be rolled back<a name="line.338"></a>
-<span class="sourceLineNo">339</span> */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
-<span class="sourceLineNo">341</span> protected boolean isRollbackSupported(final MergeTableRegionsState state) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> switch (state) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.343"></a>
-<span class="sourceLineNo">344</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.344"></a>
-<span class="sourceLineNo">345</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.345"></a>
-<span class="sourceLineNo">346</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.346"></a>
-<span class="sourceLineNo">347</span> // It is not safe to rollback in these states.<a name="line.347"></a>
-<span class="sourceLineNo">348</span> return false;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> default:<a name="line.349"></a>
-<span class="sourceLineNo">350</span> break;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return true;<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> @Override<a name="line.355"></a>
-<span class="sourceLineNo">356</span> protected MergeTableRegionsState getState(final int stateId) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return MergeTableRegionsState.forNumber(stateId);<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> @Override<a name="line.360"></a>
-<span class="sourceLineNo">361</span> protected int getStateId(final MergeTableRegionsState state) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return state.getNumber();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> @Override<a name="line.365"></a>
-<span class="sourceLineNo">366</span> protected MergeTableRegionsState getInitialState() {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return MergeTableRegionsState.MERGE_TABLE_REGIONS_PREPARE;<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> @Override<a name="line.370"></a>
-<span class="sourceLineNo">371</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.371"></a>
-<span class="sourceLineNo">372</span> throws IOException {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> super.serializeStateData(serializer);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> final MasterProcedureProtos.MergeTableRegionsStateData.Builder mergeTableRegionsMsg =<a name="line.375"></a>
-<span class="sourceLineNo">376</span> MasterProcedureProtos.MergeTableRegionsStateData.newBuilder()<a name="line.376"></a>
-<span class="sourceLineNo">377</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.377"></a>
-<span class="sourceLineNo">378</span> .setMergedRegionInfo(ProtobufUtil.toRegionInfo(mergedRegion))<a name="line.378"></a>
-<span class="sourceLineNo">379</span> .setForcible(forcible);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> for (int i = 0; i < regionsToMerge.length; ++i) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> mergeTableRegionsMsg.addRegionInfo(ProtobufUtil.toRegionInfo(regionsToMerge[i]));<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> serializer.serialize(mergeTableRegionsMsg.build());<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> @Override<a name="line.386"></a>
-<span class="sourceLineNo">387</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.387"></a>
-<span class="sourceLineNo">388</span> throws IOException {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> super.deserializeStateData(serializer);<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> final MasterProcedureProtos.MergeTableRegionsStateData mergeTableRegionsMsg =<a name="line.391"></a>
-<span class="sourceLineNo">392</span> serializer.deserialize(MasterProcedureProtos.MergeTableRegionsStateData.class);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> setUser(MasterProcedureUtil.toUserInfo(mergeTableRegionsMsg.getUserInfo()));<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> assert(mergeTableRegionsMsg.getRegionInfoCount() == 2);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> regionsToMerge = new RegionInfo[mergeTableRegionsMsg.getRegionInfoCount()];<a name="line.396"></a>
-<span class="sourceLineNo">397</span> for (int i = 0; i < regionsToMerge.length; i++) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> regionsToMerge[i] = ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getRegionInfo(i));<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">323</span> case MERGE_TABLE_REGIONS_CLOSE_REGIONS:<a name="line.323"></a>
+<span class="sourceLineNo">324</span> rollbackCloseRegionsForMerge(env);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> break;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> case MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION:<a name="line.326"></a>
+<span class="sourceLineNo">327</span> postRollBackMergeRegions(env);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> break;<a name="line.328"></a>
+<span class="sourceLineNo">329</span> case MERGE_TABLE_REGIONS_PREPARE:<a name="line.329"></a>
+<span class="sourceLineNo">330</span> break;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> default:<a name="line.331"></a>
+<span class="sourceLineNo">332</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } catch (Exception e) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> // This will be retried. Unless there is a bug in the code,<a name="line.335"></a>
+<span class="sourceLineNo">336</span> // this should be just a "temporary error" (e.g. network down)<a name="line.336"></a>
+<span class="sourceLineNo">337</span> LOG.warn("Failed rollback attempt step " + state + " for merging the regions "<a name="line.337"></a>
+<span class="sourceLineNo">338</span> + RegionInfo.getShortNameToLog(regionsToMerge) + " in table " + getTableName(), e);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> throw e;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> /*<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * Check whether we are in the state that can be rolled back<a name="line.344"></a>
+<span class="sourceLineNo">345</span> */<a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> protected boolean isRollbackSupported(final MergeTableRegionsState state) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> switch (state) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> case MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.349"></a>
+<span class="sourceLineNo">350</span> case MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.350"></a>
+<span class="sourceLineNo">351</span> case MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.351"></a>
+<span class="sourceLineNo">352</span> case MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.352"></a>
+<span class="sourceLineNo">353</span> // It is not safe to rollback in these states.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> return false;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> default:<a name="line.355"></a>
+<span class="sourceLineNo">356</span> break;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return true;<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> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> protected MergeTableRegionsState getState(final int stateId) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> return MergeTableRegionsState.forNumber(stateId);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span> protected int getStateId(final MergeTableRegionsState state) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return state.getNumber();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> @Override<a name="line.371"></a>
+<span class="sourceLineNo">372</span> protected MergeTableRegionsState getInitialState() {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> return MergeTableRegionsState.MERGE_TABLE_REGIONS_PREPARE;<a name="line.373"></a>
+<span class="sourceLineNo">374</span> }<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> @Override<a name="line.376"></a>
+<span class="sourceLineNo">377</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.377"></a>
+<span class="sourceLineNo">378</span> throws IOException {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> super.serializeStateData(serializer);<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> final MasterProcedureProtos.MergeTableRegionsStateData.Builder mergeTableRegionsMsg =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> MasterProcedureProtos.MergeTableRegionsStateData.newBuilder()<a name="line.382"></a>
+<span class="sourceLineNo">383</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.383"></a>
+<span class="sourceLineNo">384</span> .setMergedRegionInfo(ProtobufUtil.toRegionInfo(mergedRegion))<a name="line.384"></a>
+<span class="sourceLineNo">385</span> .setForcible(forcible);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> for (int i = 0; i < regionsToMerge.length; ++i) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> mergeTableRegionsMsg.addRegionInfo(ProtobufUtil.toRegionInfo(regionsToMerge[i]));<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span> serializer.serialize(mergeTableRegionsMsg.build());<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> @Override<a name="line.392"></a>
+<span class="sourceLineNo">393</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.393"></a>
+<span class="sourceLineNo">394</span> throws IOException {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> super.deserializeStateData(serializer);<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> final MasterProcedureProtos.MergeTableRegionsStateData mergeTableRegionsMsg =<a name="line.397"></a>
+<span class="sourceLineNo">398</span> serializer.deserialize(MasterProcedureProtos.MergeTableRegionsStateData.class);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> setUser(MasterProcedureUtil.toUserInfo(mergeTableRegionsMsg.getUserInfo()));<a name="line.399"></a>
<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> mergedRegion = ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getMergedRegionInfo());<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span> @Override<a name="line.404"></a>
-<span class="sourceLineNo">405</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> sb.append(getClass().getSimpleName());<a name="line.406"></a>
-<span class="sourceLineNo">407</span> sb.append(" table=");<a name="line.407"></a>
-<span class="sourceLineNo">408</span> sb.append(getTableName());<a name="line.408"></a>
-<span class="sourceLineNo">409</span> sb.append(", regions=");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> sb.append(RegionInfo.getShortNameToLog(regionsToMerge));<a name="line.410"></a>
-<span class="sourceLineNo">411</span> sb.append(", forcibly=");<a name="line.411"></a>
-<span class="sourceLineNo">412</span> sb.append(forcible);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> @Override<a name="line.415"></a>
-<span class="sourceLineNo">416</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (env.getProcedureScheduler().waitRegions(this, getTableName(),<a name="line.418"></a>
-<span class="sourceLineNo">419</span> mergedRegion, regionsToMerge[0], regionsToMerge[1])) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> try {<a name="line.420"></a>
-<span class="sourceLineNo">421</span> LOG.debug(LockState.LOCK_EVENT_WAIT + " " + env.getProcedureScheduler().dumpLocks());<a name="line.421"></a>
-<span class="sourceLineNo">422</span> } catch (IOException e) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> // TODO Auto-generated catch block<a name="line.423"></a>
-<span class="sourceLineNo">424</span> e.printStackTrace();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span> return LockState.LOCK_EVENT_WAIT;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> this.lock = true;<a name="line.428"></a>
-<span class="sourceLineNo">429</span> return LockState.LOCK_ACQUIRED;<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> @Override<a name="line.432"></a>
-<span class="sourceLineNo">433</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> this.lock = false;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> env.getProcedureScheduler().wakeRegions(this, getTableName(),<a name="line.435"></a>
-<span class="sourceLineNo">436</span> mergedRegion, regionsToMerge[0], regionsToMerge[1]);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> @Override<a name="line.439"></a>
-<span class="sourceLineNo">440</span> protected boolean holdLock(MasterProcedureEnv env) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> return true;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> @Override<a name="line.444"></a>
-<span class="sourceLineNo">445</span> protected boolean hasLock(MasterProcedureEnv env) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return this.lock;<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> @Override<a name="line.449"></a>
-<span class="sourceLineNo">450</span> public TableName getTableName() {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> return mergedRegion.getTable();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> @Override<a name="line.454"></a>
-<span class="sourceLineNo">455</span> public TableOperationType getTableOperationType() {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return TableOperationType.REGION_MERGE;<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> @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span> protected ProcedureMetrics getProcedureMetrics(MasterProcedureEnv env) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> return env.getAssignmentManager().getAssignmentManagerMetrics().getMergeProcMetrics();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> /**<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * Prepare merge and do some check<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @param env MasterProcedureEnv<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * @throws IOException<a name="line.467"></a>
-<span class="sourceLineNo">468</span> */<a name="line.468"></a>
-<span class="sourceLineNo">469</span> private boolean prepareMergeRegion(final MasterProcedureEnv env) throws IOException {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> // Note: the following logic assumes that we only have 2 regions to merge. In the future,<a name="line.470"></a>
-<span class="sourceLineNo">471</span> // if we want to extend to more than 2 regions, the code needs to be modified a little bit.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> CatalogJanitor catalogJanitor = env.getMasterServices().getCatalogJanitor();<a name="line.472"></a>
-<span class="sourceLineNo">473</span> boolean regionAHasMergeQualifier = !catalogJanitor.cleanMergeQualifier(regionsToMerge[0]);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (regionAHasMergeQualifier<a name="line.474"></a>
-<span class="sourceLineNo">475</span> || !catalogJanitor.cleanMergeQualifier(regionsToMerge[1])) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> String msg = "Skip merging regions " + RegionInfo.getShortNameToLog(regionsToMerge) +<a name="line.476"></a>
-<span class="sourceLineNo">477</span> ", because region "<a name="line.477"></a>
-<span class="sourceLineNo">478</span> + (regionAHasMergeQualifier ? regionsToMerge[0].getEncodedName() : regionsToMerge[1]<a name="line.478"></a>
-<span class="sourceLineNo">479</span> .getEncodedName()) + " has merge qualifier";<a name="line.479"></a>
-<span class="sourceLineNo">480</span> LOG.warn(msg);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> throw new MergeRegionException(msg);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> RegionStates regionStates = env.getAssignmentManager().getRegionStates();<a name="line.484"></a>
-<span class="sourceLineNo">485</span> RegionState regionStateA = regionStates.getRegionState(regionsToMerge[0].getEncodedName());<a name="line.485"></a>
-<span class="sourceLineNo">486</span> RegionState regionStateB = regionStates.getRegionState(regionsToMerge[1].getEncodedName());<a name="line.486"></a>
-<span class="sourceLineNo">487</span> if (regionStateA == null || regionStateB == null) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> throw new UnknownRegionException(<a name="line.488"></a>
-<span class="sourceLineNo">489</span> regionStateA == null ?<a name="line.489"></a>
-<span class="sourceLineNo">490</span> regionsToMerge[0].getEncodedName() : regionsToMerge[1].getEncodedName());<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> if (!regionStateA.isOpened() || !regionStateB.isOpened()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> throw new MergeRegionException(<a name="line.494"></a>
-<span class="sourceLineNo">495</span> "Unable to merge regions that are not online " + regionStateA + ", " + regionStateB);<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> if (!env.getMasterServices().isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> String regionsStr = Arrays.deepToString(regionsToMerge);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> LOG.warn("merge switch is off! skip merge of " + regionsStr);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> super.setFailure(getClass().getSimpleName(),<a name="line.501"></a>
-<span class="sourceLineNo">502</span> new IOException("Merge of " + regionsStr + " failed because merge switch is off"));<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return false;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> // Ask the remote regionserver if regions are mergeable. If we get an IOE, report it<a name="line.506"></a>
-<span class="sourceLineNo">507</span> // along with the failure, so we can see why regions are not mergeable at this time.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> IOException mergeableCheckIOE = null;<a name="line.508"></a>
-<span class="sourceLineNo">509</span> boolean mergeable = false;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RegionState current = regionStateA;<a name="line.510"></a>
-<span class="sourceLineNo">511</span> try {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> mergeable = isMergeable(env, current);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> } catch (IOException e) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> mergeableCheckIOE = e;<a name="line.514"></a>
+<span class="sourceLineNo">401</span> assert(mergeTableRegionsMsg.getRegionInfoCount() == 2);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> regionsToMerge = new RegionInfo[mergeTableRegionsMsg.getRegionInfoCount()];<a name="line.402"></a>
+<span class="sourceLineNo">403</span> for (int i = 0; i < regionsToMerge.length; i++) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> regionsToMerge[i] = ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getRegionInfo(i));<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> mergedRegion = ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getMergedRegionInfo());<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> @Override<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> sb.append(getClass().getSimpleName());<a name="line.412"></a>
+<span class="sourceLineNo">413</span> sb.append(" table=");<a name="line.413"></a>
+<span class="sourceLineNo">414</span> sb.append(getTableName());<a name="line.414"></a>
+<span class="sourceLineNo">415</span> sb.append(", regions=");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> sb.append(RegionInfo.getShortNameToLog(regionsToMerge));<a name="line.416"></a>
+<span class="sourceLineNo">417</span> sb.append(", forcibly=");<a name="line.417"></a>
+<span class="sourceLineNo">418</span> sb.append(forcible);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span> @Override<a name="line.421"></a>
+<span class="sourceLineNo">422</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (env.getProcedureScheduler().waitRegions(this, getTableName(),<a name="line.424"></a>
+<span class="sourceLineNo">425</span> mergedRegion, regionsToMerge[0], regionsToMerge[1])) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> try {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> LOG.debug(LockState.LOCK_EVENT_WAIT + " " + env.getProcedureScheduler().dumpLocks());<a name="line.427"></a>
+<span class="sourceLineNo">428</span> } catch (IOException e) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // TODO Auto-generated catch block<a name="line.429"></a>
+<span class="sourceLineNo">430</span> e.printStackTrace();<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">432</span> return LockState.LOCK_EVENT_WAIT;<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> this.lock = true;<a name="line.434"></a>
+<span class="sourceLineNo">435</span> return LockState.LOCK_ACQUIRED;<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> @Override<a name="line.438"></a>
+<span class="sourceLineNo">439</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> this.lock = false;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> env.getProcedureScheduler().wakeRegions(this, getTableName(),<a name="line.441"></a>
+<span class="sourceLineNo">442</span> mergedRegion, regionsToMerge[0], regionsToMerge[1]);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> @Override<a name="line.445"></a>
+<span class="sourceLineNo">446</span> protected boolean holdLock(MasterProcedureEnv env) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> return true;<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> @Override<a name="line.450"></a>
+<span class="sourceLineNo">451</span> protected boolean hasLock(MasterProcedureEnv env) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> return this.lock;<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span> @Override<a name="line.455"></a>
+<span class="sourceLineNo">456</span> public TableName getTableName() {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> return mergedRegion.getTable();<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> @Override<a name="line.460"></a>
+<span class="sourceLineNo">461</span> public TableOperationType getTableOperationType() {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> return TableOperationType.REGION_MERGE;<a name="line.462"></a>
+<span class="sourceLineNo">463</span> }<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span> @Override<a name="line.465"></a>
+<span class="sourceLineNo">466</span> protected ProcedureMetrics getProcedureMetrics(MasterProcedureEnv env) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> return env.getAssignmentManager().getAssignmentManagerMetrics().getMergeProcMetrics();<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<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> * check the closed regions<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @param env the master env<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * @throws IOException IOException<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> private void checkClosedRegions(final MasterProcedureEnv env) throws IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> checkClosedRegion(env, regionsToMerge[0]);<a name="line.476"></a>
+<span class="sourceLineNo">477</span> checkClosedRegion(env, regionsToMerge[1]);<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> /**<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * Check whether there is recovered.edits in the closed region<a name="line.481"></a>
+<span class="sourceLineNo">482</span> * If any, that means this region is not closed property, we need<a name="line.482"></a>
+<span class="sourceLineNo">483</span> * to abort region merge to prevent data loss<a name="line.483"></a>
+<span class="sourceLineNo">484</span> * @param env master env<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * @param regionInfo regioninfo<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @throws IOException IOException<a name="line.486"></a>
+<span class="sourceLineNo">487</span> */<a name="line.487"></a>
+<span class="sourceLineNo">488</span> private void checkClosedRegion(final MasterProcedureEnv env,<a name="line.488"></a>
+<span class="sourceLineNo">489</span> RegionInfo regionInfo) throws IOException {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (WALSplitter.hasRecoveredEdits(env.getMasterServices().getFileSystem(),<a name="line.490"></a>
+<span class="sourceLineNo">491</span> env.getMasterConfiguration(), regionInfo)) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> throw new IOException("Recovered.edits are found in Region: " + regionInfo<a name="line.492"></a>
+<span class="sourceLineNo">493</span> + ", abort merge to prevent data loss");<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> /**<a name="line.497"></a>
+<span class="sourceLineNo">498</span> * Prepare merge and do some check<a name="line.498"></a>
+<span class="sourceLineNo">499</span> * @param env MasterProcedureEnv<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * @throws IOException<a name="line.500"></a>
+<span class="sourceLineNo">501</span> */<a name="line.501"></a>
+<span class="sourceLineNo">502</span> private boolean prepareMergeRegion(final MasterProcedureEnv env) throws IOException {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> // Note: the following logic assumes that we only have 2 regions to merge. In the future,<a name="line.503"></a>
+<span class="sourceLineNo">504</span> // if we want to extend to more than 2 regions, the code needs to be modified a little bit.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> CatalogJanitor catalogJanitor = env.getMasterServices().getCatalogJanitor();<a name="line.505"></a>
+<span class="sourceLineNo">506</span> boolean regionAHasMergeQualifier = !catalogJanitor.cleanMergeQualifier(regionsToMerge[0]);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> if (regionAHasMergeQualifier<a name="line.507"></a>
+<span class="sourceLineNo">508</span> || !catalogJanitor.cleanMergeQualifier(regionsToMerge[1])) {<a name="line.508"></a>
+<span class="sourceLineNo">509</span> String msg = "Skip merging regions " + RegionInfo.getShortNameToLog(regionsToMerge) +<a name="line.509"></a>
+<span class="sourceLineNo">510</span> ", because region "<a name="line.510"></a>
+<span class="sourceLineNo">511</span> + (regionAHasMergeQualifier ? regionsToMerge[0].getEncodedName() : regionsToMerge[1]<a name="line.511"></a>
+<span class="sourceLineNo">512</span> .getEncodedName()) + " has merge qualifier";<a name="line.512"></a>
+<span class="sourceLineNo">513</span> LOG.warn(msg);<a name="line.513"></a>
+<span class="sourceLineNo">514</span> throw new MergeRegionException(msg);<a name="line.514"></a>
<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (mergeable && mergeableCheckIOE == null) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> current = regionStateB;<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> mergeable = isMergeable(env, current);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } catch (IOException e) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> mergeableCheckIOE = e;<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 (!mergeable) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> IOException e = new IOException(current.getRegion().getShortNameToLog() + " NOT mergeable");<a name="line.525"></a>
-<span class="sourceLineNo">526</span> if (mergeableCheckIOE != null) e.initCause(mergeableCheckIOE);<a name="line.526"></a>
-<span class="sourceLineNo">527</span> super.setFailure(getClass().getSimpleName(), e);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> return false;<a name="line.528"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> RegionStates regionStates = env.getAssignmentManager().getRegionStates();<a name="line.517"></a>
+<span class="sourceLineNo">518</span> RegionState regionStateA = regionStates.getRegionState(regionsToMerge[0].getEncodedName());<a name="line.518"></a>
+<span class="sourceLineNo">519</span> RegionState regionStateB = regionStates.getRegionState(regionsToMerge[1].getEncodedName());<a name="line.519"></a>
+<span class="sourceLineNo">520</span> if (regionStateA == null || regionStateB == null) {<a name="line.520"></a>
+<span class="sourceLineNo">521</span> throw new UnknownRegionException(<a name="line.521"></a>
+<span class="sourceLineNo">522</span> regionStateA == null ?<a name="line.522"></a>
+<span class="sourceLineNo">523</span> regionsToMerge[0].getEncodedName() : regionsToMerge[1].getEncodedName());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span> if (!regionStateA.isOpened() || !regionStateB.isOpened()) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new MergeRegionException(<a name="line.527"></a>
+<span class="sourceLineNo">528</span> "Unable to merge regions that are not online " + regionStateA + ", " + regionStateB);<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> // Update region states to Merging<a name="line.531"></a>
-<span class="sourceLineNo">532</span> setRegionStateToMerging(env);<a name="line.532"></a>
-<span class="sourceLineNo">533</span> return true;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> }<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> private boolean isMergeable(final MasterProcedureEnv env, final RegionState rs)<a name="line.536"></a>
-<span class="sourceLineNo">537</span> throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> GetRegionInfoResponse response =<a name="line.538"></a>
-<span class="sourceLineNo">539</span> Util.getRegionInfoResponse(env, rs.getServerName(), rs.getRegion());<a name="line.539"></a>
-<span class="sourceLineNo">540</span> return response.hasMergeable() && response.getMergeable();<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> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * Pre merge region action<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * @param env MasterProcedureEnv<a name="line.545"></a>
-<span class="sourceLineNo">546</span> **/<a name="line.546"></a>
-<span class="sourceLineNo">547</span> private void preMergeRegions(final MasterProcedureEnv env) throws IOException {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.548"></a>
-<span class="sourceLineNo">549</span> if (cpHost != null) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> cpHost.preMergeRegionsAction(regionsToMerge, getUser());<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> // TODO: Clean up split and merge. Currently all over the place.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> try {<a name="line.553"></a>
-<span class="sourceLineNo">554</span> env.getMasterServices().getMasterQuotaManager().onRegionMerged(this.mergedRegion);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> } catch (QuotaExceededException e) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> env.getMasterServices().getRegionNormalizer().planSkipped(this.mergedRegion,<a name="line.556"></a>
-<span class="sourceLineNo">557</span> NormalizationPlan.PlanType.MERGE);<a name="line.557"></a>
-<span class="sourceLineNo">558</span> throw e;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<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> * Action after rollback a merge table regions action.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * @param env MasterProcedureEnv<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * @throws IOException<a name="line.565"></a>
-<span class="sourceLineNo">566</span> */<a name="line.566"></a>
-<span class="sourceLineNo">567</span> private void postRollBackMergeRegions(final MasterProcedureEnv env) throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> if (cpHost != null) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> cpHost.postRollBackMergeRegionsAction(regionsToMerge, getUser());<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> /**<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * Set the region states to MERGING state<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @param env MasterProcedureEnv<a name="line.576"></a>
-<span class="sourceLineNo">577</span> */<a name="line.577"></a>
-<span class="sourceLineNo">578</span> public void setRegionStateToMerging(final MasterProcedureEnv env) {<a name="line.578"></a>
-<span class="sourceLineNo">579</span> // Set State.MERGING to regions to be merged<a name="line.579"></a>
-<span class="sourceLineNo">580</span> RegionStates regionStates = env.getAssignmentManager().getRegionStates();<a name="line.580"></a>
-<span class="sourceLineNo">581</span> regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.MERGING);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.MERGING);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span> /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span> * Create a merged region<a name="line.586"></a>
-<span class="sourceLineNo">587</span> * @param env MasterProcedureEnv<a name="line.587"></a>
-<span class="sourceLineNo">588</span> */<a name="line.588"></a>
-<span class="sourceLineNo">589</span> private void createMergedRegion(final MasterProcedureEnv env) throws IOException {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.590"></a>
-<span class="sourceLineNo">591</span> final Path tabledir = FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> final FileSystem fs = mfs.getFileSystem();<a name="line.592"></a>
-<span class="sourceLineNo">593</span> HRegionFileSystem regionFs = HRegionFileSystem.openRegionFromFileSystem(<a name="line.593"></a>
-<span class="sourceLineNo">594</span> env.getMasterConfiguration(), fs, tabledir, regionsToMerge[0], false);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> regionFs.createMergesDir();<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> mergeStoreFiles(env, regionFs, regionFs.getMergesDir());<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HRegionFileSystem regionFs2 = HRegionFileSystem.openRegionFromFileSystem(<a name="line.598"></a>
-<span class="sourceLineNo">599</span> env.getMasterConfiguration(), fs, tabledir, regionsToMerge[1], false);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> mergeStoreFiles(env, regionFs2, regionFs.getMergesDir());<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span> regionFs.commitMergedRegion(mergedRegion);<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span> //Prepare to create merged regions<a name="line.604"></a>
-<span class="sourceLineNo">605</span> env.getAssignmentManager().getRegionStates().<a name="line.605"></a>
-<span class="sourceLineNo">606</span> getOrCreateRegionStateNode(mergedRegion).setState(State.MERGING_NEW);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> /**<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * Create reference file(s) of merging regions under the merged directory<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * @param env MasterProcedureEnv<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * @param regionFs region file system<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * @param mergedDir the temp directory of merged region<a name="line.613"></a>
-<span class="sourceLineNo">614</span> */<a name="line.614"></a>
-<span class="sourceLineNo">615</span> private void mergeStoreFiles(<a name="line.615"></a>
-<span class="sourceLineNo">616</span> final MasterProcedureEnv env, final HRegionFileSystem regionFs, final Path mergedDir)<a name="line.616"></a>
-<span class="sourceLineNo">617</span> throws IOException {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.618"></a>
-<span class="sourceLineNo">619</span> final Configuration conf = env.getMasterConfiguration();<a name="line.619"></a>
-<span class="sourceLineNo">620</span> final TableDescriptor htd = env.getMasterServices().getTableDescriptors().get(getTableName());<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span> for (String family: regionFs.getFamilies()) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> final ColumnFamilyDescriptor hcd = htd.getColumnFamily(Bytes.toBytes(family));<a name="line.623"></a>
-<span class="sourceLineNo">624</span> final Collection<StoreFileInfo> storeFiles = regionFs.getStoreFiles(family);<a name="line.624"></a>
-<span class="sourceLineNo">625</span><a name="line.625"></a>
-<span class="sourceLineNo">626</span> if (storeFiles != null && storeFiles.size() > 0) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> final CacheConfig cacheConf = new CacheConfig(conf, hcd);<a name="line.627"></a>
-<span class="sourceLineNo">628</span> for (StoreFileInfo storeFileInfo: storeFiles) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span> // Create reference file(s) of the region in mergedDir<a name="line.629"></a>
-<span class="sourceLineNo">630</span> regionFs.mergeStoreFile(mergedRegion, family, new HStoreFile(mfs.getFileSystem(),<a name="line.630"></a>
-<span class="sourceLineNo">631</span> storeFileInfo, conf, cacheConf, hcd.getBloomFilterType(), true),<a name="line.631"></a>
-<span class="sourceLineNo">632</span> mergedDir);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span> /**<a name="line.638"></a>
-<span class="sourceLineNo">639</span> * Clean up a merged region<a name="line.639"></a>
-<span class="sourceLineNo">640</span> * @param env MasterProcedureEnv<a name="line.640"></a>
-<span class="sourceLineNo">641</span> */<a name="line.641"></a>
-<span class="sourceLineNo">642</span> private void cleanupMergedRegion(final MasterProcedureEnv env) throws IOException {<a name="line.642"></a>
-<span class="sourceLineNo">643</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.643"></a>
-<span class="sourceLineNo">644</span> final Path tabledir = FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a name="line.644"></a>
-<span class="sourceLineNo">645</span> final FileSystem fs = mfs.getFileSystem();<a name="line.645"></a>
-<span class="sourceLineNo">646</span> HRegionFileSystem regionFs = HRegionFileSystem.openRegionFromFileSystem(<a name="line.646"></a>
-<span class="sourceLineNo">647</span> env.getMasterConfiguration(), fs, tabledir, regionsToMerge[0], false);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> regionFs.cleanupMergedRegion(mergedRegion);<a name="line.648"></a>
-<span class="sourceLineNo">649</span> }<a name="line.649"></a>
-<span class="sourceLineNo">650</span><a name="line.650"></a>
-<span class="sourceLineNo">651</span> /**<a name="line.651"></a>
-<span class="sourceLineNo">652</span> * Rollback close regions<a name="line.652"></a>
-<span class="sourceLineNo">653</span> * @param env MasterProcedureEnv<a name="line.653"></a>
-<span class="sourceLineNo">654</span> **/<a name="line.654"></a>
-<span class="sourceLineNo">655</span> private void rollbackCloseRegionsForMerge(final MasterProcedureEnv env) throws IOException {<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // Check whether the region is closed; if so, open it in the same server<a name="line.656"></a>
-<span class="sourceLineNo">657</span> final int regionReplication = getRegionReplication(env);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> final ServerName serverName = getServerName(env);<a name="line.658"></a>
-<span class="sourceLineNo">659</span><a name="line.659"></a>
-<span class="sourceLineNo">660</span> final AssignProcedure[] procs =<a name="line.660"></a>
-<span class="sourceLineNo">661</span> new AssignProcedure[regionsToMerge.length * regionReplication];<a name="line.661"></a>
-<span class="sourceLineNo">662</span> int procsIdx = 0;<a name="line.662"></a>
-<span class="sourceLineNo">663</span> for (int i = 0; i < regionsToMerge.length; ++i) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span> for (int j = 0; j < regionReplication; ++j) {<a name="line.664"></a>
-<span class="sourceLineNo">665</span> final RegionInfo hri = RegionReplicaUtil.getRegionInfoForReplica(regionsToMerge[i], j);<a name="line.665"></a>
-<span class="sourceLineNo">666</span> procs[procsIdx++] = env.getAssignmentManager().createAssignProcedure(hri, serverName);<a name="line.666"></a>
+<span class="sourceLineNo">531</span> if (!env.getMasterServices().isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> String regionsStr = Arrays.deepToString(regionsToMerge);<a name="line.532"></a>
+<span class="sourceLineNo">533</span> LOG.warn("merge switch is off! skip merge of " + regionsStr);<a name="line.533"></a>
+<span class="sourceLineNo">534</span> super.setFailure(getClass().getSimpleName(),<a name="line.534"></a>
+<span class="sourceLineNo">535</span> new IOException("Merge of " + regionsStr + " failed because merge switch is off"));<a name="line.535"></a>
+<span class="sourceLineNo">536</span> return false;<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> // Ask the remote regionserver if regions are mergeable. If we get an IOE, report it<a name="line.539"></a>
+<span class="sourceLineNo">540</span> // along with the failure, so we can see why regions are not mergeable at this time.<a name="line.540"></a>
+<span class="sourceLineNo">541</span> IOException mergeableCheckIOE = null;<a name="line.541"></a>
+<span class="sourceLineNo">542</span> boolean mergeable = false;<a name="line.542"></a>
+<span class="sourceLineNo">543</span> RegionState current = regionStateA;<a name="line.543"></a>
+<span class="sourceLineNo">544</span> try {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> mergeable = isMergeable(env, current);<a name="line.545"></a>
+<span class="sourceLineNo">546</span> } catch (IOException e) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span> mergeableCheckIOE = e;<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span> if (mergeable && mergeableCheckIOE == null) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> current = regionStateB;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> try {<a name="line.551"></a>
+<span class="sourceLineNo">552</span> mergeable = isMergeable(env, current);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> } catch (IOException e) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> mergeableCheckIOE = e;<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> if (!mergeable) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> IOException e = new IOException(current.getRegion().getShortNameToLog() + " NOT mergeable");<a name="line.558"></a>
+<span class="sourceLineNo">559</span> if (mergeableCheckIOE != null) e.initCause(mergeableCheckIOE);<a name="line.559"></a>
+<span class="sourceLineNo">560</span> super.setFailure(getClass().getSimpleName(), e);<a name="line.560"></a>
+<span class="sourceLineNo">561</span> return false;<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> // Update region states to Merging<a name="line.564"></a>
+<span class="sourceLineNo">565</span> setRegionStateToMerging(env);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> return true;<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 boolean isMergeable(final MasterProcedureEnv env, final RegionState rs)<a name="line.569"></a>
+<span class="sourceLineNo">570</span> throws IOException {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> GetRegionInfoResponse response =<a name="line.571"></a>
+<span class="sourceLineNo">572</span> Util.getRegionInfoResponse(env, rs.getServerName(), rs.getRegion());<a name="line.572"></a>
+<span class="sourceLineNo">573</span> return response.hasMergeable() && response.getMergeable();<a name="line.573"></a>
+<span class="sourceLineNo">574</span> }<a name="line.574"></a>
+<span class="sourceLineNo">575</span><a name="line.575"></a>
+<span class="sourceLineNo">576</span> /**<a name="line.576"></a>
+<span class="sourceLineNo">577</span> * Pre merge region action<a name="line.577"></a>
+<span class="sourceLineNo">578</span> * @param env MasterProcedureEnv<a name="line.578"></a>
+<span class="sourceLineNo">579</span> **/<a name="line.579"></a>
+<span class="sourceLineNo">580</span> private void preMergeRegions(final MasterProcedureEnv env) throws IOException {<a name="line.580"></a>
+<span class="sourceLineNo">581</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.581"></a>
+<span class="sourceLineNo">582</span> if (cpHost != null) {<a name="line.582"></a>
+<span class="sourceLineNo">583</span> cpHost.preMergeRegionsAction(regionsToMerge, getUser());<a name="line.583"></a>
+<span class="sourceLineNo">584</span> }<a name="line.584"></a>
+<span class="sourceLineNo">585</span> // TODO: Clean up split and merge. Currently all over the place.<a name="line.585"></a>
+<span class="sourceLineNo">586</span> try {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> env.getMasterServices().getMasterQuotaManager().onRegionMerged(this.mergedRegion);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> } catch (QuotaExceededException e) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> env.getMasterServices().getRegionNormalizer().planSkipped(this.mergedRegion,<a name="line.589"></a>
+<span class="sourceLineNo">590</span> NormalizationPlan.PlanType.MERGE);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> throw e;<a name="line.591"></a>
+<span class="sourceLineNo">592</span> }<a name="line.592"></a>
+<span class="sourceLineNo">593</span> }<a name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span> /**<a name="line.595"></a>
+<span class="sourceLineNo">596</span> * Action after rollback a merge table regions action.<a name="line.596"></a>
+<span class="sourceLineNo">597</span> * @param env MasterProcedureEnv<a name="line.597"></a>
+<span class="sourceLineNo">598</span> * @throws IOException<a name="line.598"></a>
+<span class="sourceLineNo">599</span> */<a name="line.599"></a>
+<span class="sourceLineNo">600</span> private void postRollBackMergeRegions(final MasterProcedureEnv env) throws IOException {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.601"></a>
+<span class="sourceLineNo">602</span> if (cpHost != null) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> cpHost.postRollBackMergeRegionsAction(regionsToMerge, getUser());<a name="line.603"></a>
+<span class="sourceLineNo">604</span> }<a name="line.604"></a>
+<span class="sourceLineNo">605</span> }<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">608</span> * Set the region states to MERGING state<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @param env MasterProcedureEnv<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public void setRegionStateToMerging(final MasterProcedureEnv env) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> // Set State.MERGING to regions to be merged<a name="line.612"></a>
+<span class="sourceLineNo">613</span> RegionStates regionStates = env.getAssignmentManager().getRegionStates();<a name="line.613"></a>
+<span class="sourceLineNo">614</span> regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.MERGING);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.MERGING);<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> /**<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * Create a merged region<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * @param env MasterProcedureEnv<a name="line.620"></a>
+<span class="sourceLineNo">621</span> */<a name="line.621"></a>
+<span class="sourceLineNo">622</span> private void createMergedRegion(final MasterProcedureEnv env) throws IOException {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.623"></a>
+<span class="sourceLineNo">624</span> final Path tabledir = FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> final FileSystem fs = mfs.getFileSystem();<a name="line.625"></a>
+<span class="sourceLineNo">626</span> HRegionFileSystem regionFs = HRegionFileSystem.openRegionFromFileSystem(<a name="line.626"></a>
+<span class="sourceLineNo">627</span> env.getMasterConfiguration(), fs, tabledir, regionsToMerge[0], false);<a name="line.627"></a>
+<span class="sourceLineNo">628</span> regionFs.createMergesDir();<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span> mergeStoreFiles(env, regionFs, regionFs.getMergesDir());<a name="line.630"></a>
+<span class="sourceLineNo">631</span> HRegionFileSystem regionFs2 = HRegionFileSystem.openRegionFromFileSystem(<a name="line.631"></a>
+<span class="sourceLineNo">632</span> env.getMasterConfiguration(), fs, tabledir, regionsToMerge[1], false);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> mergeStoreFiles(env, regionFs2, regionFs.getMergesDir());<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> regionFs.commitMergedRegion(mergedRegion);<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span> //Prepare to create merged regions<a name="line.637"></a>
+<span class="sourceLineNo">638</span> env.getAssignmentManager().getRegionStates().<a name="line.638"></a>
+<span class="sourceLineNo">639</span> getOrCreateRegionStateNode(mergedRegion).setState(State.MERGING_NEW);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> /**<a name="line.642"></a>
+<span class="sourceLineNo">643</span> * Create reference file(s) of merging regions under the merged directory<a name="line.643"></a>
+<span class="sourceLineNo">644</span> * @param env MasterProcedureEnv<a name="line.644"></a>
+<span class="sourceLineNo">645</span> * @param regionFs region file system<a name="line.645"></a>
+<span class="sourceLineNo">646</span> * @param mergedDir the temp directory of merged region<a name="line.646"></a>
+<span class="sourceLineNo">647</span> */<a name="line.647"></a>
+<span class="sourceLineNo">648</span> private void mergeStoreFiles(<a name="line.648"></a>
+<span class="sourceLineNo">649</span> final MasterProcedureEnv env, final HRegionFileSystem regionFs, final Path mergedDir)<a name="line.649"></a>
+<span class="sourceLineNo">650</span> throws IOException {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.651"></a>
+<span class="sourceLineNo">652</span> final Configuration conf = env.getMasterConfiguration();<a name="line.652"></a>
+<span class="sourceLineNo">653</span> final TableDescriptor htd = env.getMasterServices().getTableDescriptors().get(getTableName());<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span> for (String family: regionFs.getFamilies()) {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> final ColumnFamilyDescriptor hcd = htd.getColumnFamily(Bytes.toBytes(family));<a name="line.656"></a>
+<span class="sourceLineNo">657</span> final Collection<StoreFileInfo> storeFiles = regionFs.getStoreFiles(family);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> if (storeFiles != null && storeFiles.size() > 0) {<a name="line.659"></a>
+<span class="sourceLineNo">660</span> final CacheConfig cacheConf = new CacheConfig(conf, hcd);<a name="line.660"></a>
+<span class="sourceLineNo">661</span> for (StoreFileInfo storeFileInfo: storeFiles) {<a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Create reference file(s) of the region in mergedDir<a name="line.662"></a>
+<span class="sourceLineNo">663</span> regionFs.mergeStoreFile(mergedRegion, family, new HStoreFile(mfs.getFileSystem(),<a name="line.663"></a>
+<span class="sourceLineNo">664</span> storeFileInfo, conf, cacheConf, hcd.getBloomFilterType(), true),<a name="line.664"></a>
+<span class="sourceLineNo">665</span> mergedDir);<a name="line.665"></a>
+<span class="sourceLineNo">666</span> }<a name="line.666"></a>
<span class="sourceLineNo">667</span> }<a name="line.667"></a>
<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> env.getMasterServices().getMasterProcedureExecutor().submitProcedures(procs);<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> private UnassignProcedure[] createUnassignProcedures(final MasterProcedureEnv env,<a name="line.672"></a>
-<span class="sourceLineNo">673</span> final int regionReplication) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span> final UnassignProcedure[] procs =<a name="line.674"></a>
-<span class="sourceLineNo">675</span> new UnassignProcedure[regionsToMerge.length * regionReplication];<a name="line.675"></a>
-<span class="sourceLineNo">676</span> int procsIdx = 0;<a name="line.676"></a>
-<span class="sourceLineNo">677</span> for (int i = 0; i < regionsToMerge.length; ++i) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span> for (int j = 0; j < regionReplication; ++j) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> final RegionInfo hri = RegionReplicaUtil.getRegionInfoForReplica(regionsToMerge[i], j);<a name="line.679"></a>
-<span class="sourceLineNo">680</span> procs[procsIdx++] = env.getAssignmentManager().<a name="line.680"></a>
-<span class="sourceLineNo">681</span> createUnassignProcedure(hri, null, true, !RegionReplicaUtil.isDefaultReplica(hri));<a name="line.681"></a>
-<span class="sourceLineNo">682</span> }<a name="line.682"></a>
-<span class="sourceLineNo">683</span> }<a name="line.683"></a>
-<span class="sourceLineNo">684</span> return procs;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> private AssignProcedure[] createAssignProcedures(final MasterProcedureEnv env,<a name="line.687"></a>
-<span class="sourceLineNo">688</span> final int regionReplication) {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> final ServerName targetServer = getServerName(env);<a name="line.689"></a>
-<span class="sourceLineNo">690</span>
<TRUNCATED>
[07/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html b/devapidocs/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
index d82267d..2604610 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":9,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":9,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":9,"i6":10,"i7":10,"i8":10,"i9":9,"i10":9,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":9,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -280,12 +280,27 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
</td>
</tr>
<tr id="i2" class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-">checkClosedRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+ <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code>
+<div class="block">Check whether there is recovered.edits in the closed region
+ If any, that means this region is not closed property, we need
+ to abort region merge to prevent data loss</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
+<div class="block">check the closed regions</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkRegionsToMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo:A-boolean-">checkRegionsToMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
boolean forcible)</code> </td>
</tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkRegionsToMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-boolean-">checkRegionsToMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
@@ -294,138 +309,138 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<div class="block">One time checks.</div>
</td>
</tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#cleanupMergedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">cleanupMergedRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Clean up a merged region</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">AssignProcedure</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createAssignProcedures-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-int-">createAssignProcedures</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
int regionReplication)</code> </td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createMergedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">createMergedRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Create a merged region</div>
</td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>private static <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createMergedRegionInfo-org.apache.hadoop.hbase.client.RegionInfo:A-">createMergedRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge)</code> </td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>private static <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createMergedRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">createMergedRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeB)</code>
<div class="block">Create merged region info through the specified two regions</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/UnassignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">UnassignProcedure</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#createUnassignProcedures-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-int-">createUnassignProcedures</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
int regionReplication)</code> </td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#deserializeStateData-org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer-">deserializeStateData</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)</code>
<div class="block">Called on store load to allow the user to decode the previously serialized
state.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2">StateMachineProcedure.Flow</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#executeFromState-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState-">executeFromState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</code>
<div class="block">called to perform a single step of the specified 'state' of the procedure</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getInitialState--">getInitialState</a></span>()</code>
<div class="block">Return the initial state object that will be used for the first call to executeFromState().</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getMergedRegion--">getMergedRegion</a></span>()</code> </td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><code>private static long</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getMergedRegionIdTimestamp-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">getMergedRegionIdTimestamp</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeA,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionToMergeB)</code> </td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureMetrics.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureMetrics</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getProcedureMetrics-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">getProcedureMetrics</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Override this method to provide procedure specific counters for submitted count, failed
count and time histogram.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code>private int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getRegionReplication-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">getRegionReplication</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code> </td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getServerName-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">getServerName</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">The procedure could be restarted from a different machine.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getState-int-">getState</a></span>(int stateId)</code>
<div class="block">Convert an ordinal (or state id) to an Enum (or more descriptive) state object.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code>protected int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getStateId-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState-">getStateId</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</code>
<div class="block">Convert the Enum (or more descriptive) state object to an ordinal (or state id).</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getTableName--">getTableName</a></span>()</code> </td>
</tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure">TableProcedureInterface.TableOperationType</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#getTableOperationType--">getTableOperationType</a></span>()</code>
<div class="block">Given an operation type we can take decisions about what to do with pending operations.</div>
</td>
</tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#hasLock-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">hasLock</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">This is used in conjunction with <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#holdLock-TEnvironment-"><code>Procedure.holdLock(Object)</code></a>.</div>
</td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#holdLock-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">holdLock</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Used to keep the procedure lock even when the procedure is yielding or suspended.</div>
</td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#isMergeable-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.master.RegionState-">isMergeable</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a> rs)</code> </td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#isRollbackSupported-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState-">isRollbackSupported</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</code>
<div class="block">Used by the default implementation of abort() to know if the current state can be aborted
and rollback can be triggered.</div>
</td>
</tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#isTraceEnabled--">isTraceEnabled</a></span>()</code>
<div class="block">The procedure could be restarted from a different machine.</div>
</td>
</tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#mergeStoreFiles-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.regionserver.HRegionFileSystem-org.apache.hadoop.fs.Path-">mergeStoreFiles</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionFileSystem.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionFileSystem</a> regionFs,
@@ -433,55 +448,55 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<div class="block">Create reference file(s) of merging regions under the merged directory</div>
</td>
</tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#postCompletedMergeRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">postCompletedMergeRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Post merge region action</div>
</td>
</tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#postMergeRegionsCommit-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">postMergeRegionsCommit</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Post merge region action</div>
</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#postRollBackMergeRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">postRollBackMergeRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Action after rollback a merge table regions action.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#preMergeRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">preMergeRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Pre merge region action</div>
</td>
</tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#preMergeRegionsCommit-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">preMergeRegionsCommit</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Post merge region action</div>
</td>
</tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
<td class="colFirst"><code>private boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#prepareMergeRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">prepareMergeRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Prepare merge and do some check</div>
</td>
</tr>
-<tr id="i34" class="altColor">
+<tr id="i36" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#releaseLock-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">releaseLock</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">The user should override this method, and release lock if necessary.</div>
</td>
</tr>
-<tr id="i35" class="rowColor">
+<tr id="i37" class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#rollbackCloseRegionsForMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">rollbackCloseRegionsForMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Rollback close regions</div>
</td>
</tr>
-<tr id="i36" class="altColor">
+<tr id="i38" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#rollbackState-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState-">rollbackState</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</code>
@@ -490,33 +505,33 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
AssignProcedures) .</div>
</td>
</tr>
-<tr id="i37" class="rowColor">
+<tr id="i39" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#serializeStateData-org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer-">serializeStateData</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)</code>
<div class="block">The user-level code of the procedure may have some state to
persist (e.g.</div>
</td>
</tr>
-<tr id="i38" class="altColor">
+<tr id="i40" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#setRegionStateToMerging-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">setRegionStateToMerging</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Set the region states to MERGING state</div>
</td>
</tr>
-<tr id="i39" class="rowColor">
+<tr id="i41" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#toStringClassDetails-java.lang.StringBuilder-">toStringClassDetails</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb)</code>
<div class="block">Extend the toString() information with the procedure details
e.g.</div>
</td>
</tr>
-<tr id="i40" class="altColor">
+<tr id="i42" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#updateMetaForMergedRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">updateMetaForMergedRegions</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Add merged region to META and delete original regions.</div>
</td>
</tr>
-<tr id="i41" class="rowColor">
+<tr id="i43" class="rowColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#writeMaxSequenceIdFile-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">writeMaxSequenceIdFile</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code> </td>
</tr>
@@ -790,7 +805,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>rollbackState</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.293">rollbackState</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.297">rollbackState</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">To rollback <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment"><code>MergeTableRegionsProcedure</code></a>, two AssignProcedures are asynchronously
@@ -812,7 +827,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>isRollbackSupported</h4>
-<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.341">isRollbackSupported</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</pre>
+<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.347">isRollbackSupported</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html#isRollbackSupported-TState-">StateMachineProcedure</a></code></span></div>
<div class="block">Used by the default implementation of abort() to know if the current state can be aborted
and rollback can be triggered.</div>
@@ -828,7 +843,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getState</h4>
-<pre>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.356">getState</a>(int stateId)</pre>
+<pre>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.362">getState</a>(int stateId)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html#getState-int-">StateMachineProcedure</a></code></span></div>
<div class="block">Convert an ordinal (or state id) to an Enum (or more descriptive) state object.</div>
<dl>
@@ -847,7 +862,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getStateId</h4>
-<pre>protected int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.361">getStateId</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</pre>
+<pre>protected int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.367">getStateId</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState state)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html#getStateId-TState-">StateMachineProcedure</a></code></span></div>
<div class="block">Convert the Enum (or more descriptive) state object to an ordinal (or state id).</div>
<dl>
@@ -866,7 +881,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getInitialState</h4>
-<pre>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.366">getInitialState</a>()</pre>
+<pre>protected org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsState <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.372">getInitialState</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html#getInitialState--">StateMachineProcedure</a></code></span></div>
<div class="block">Return the initial state object that will be used for the first call to executeFromState().</div>
<dl>
@@ -883,7 +898,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>serializeStateData</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.371">serializeStateData</a>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.377">serializeStateData</a>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#serializeStateData-org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer-">Procedure</a></code></span></div>
<div class="block">The user-level code of the procedure may have some state to
@@ -905,7 +920,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>deserializeStateData</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.387">deserializeStateData</a>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.393">deserializeStateData</a>(<a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureStateSerializer</a> serializer)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#deserializeStateData-org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer-">Procedure</a></code></span></div>
<div class="block">Called on store load to allow the user to decode the previously serialized
@@ -926,7 +941,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>toStringClassDetails</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.405">toStringClassDetails</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.411">toStringClassDetails</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#toStringClassDetails-java.lang.StringBuilder-">Procedure</a></code></span></div>
<div class="block">Extend the toString() information with the procedure details
e.g. className and parameters</div>
@@ -944,7 +959,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>acquireLock</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2">Procedure.LockState</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.416">acquireLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2">Procedure.LockState</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.422">acquireLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#acquireLock-TEnvironment-">Procedure</a></code></span></div>
<div class="block">The user should override this method if they need a lock on an Entity.
A lock can be anything, and it is up to the implementor. The Procedure
@@ -981,7 +996,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>releaseLock</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.433">releaseLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.439">releaseLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#releaseLock-TEnvironment-">Procedure</a></code></span></div>
<div class="block">The user should override this method, and release lock if necessary.</div>
<dl>
@@ -996,7 +1011,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>holdLock</h4>
-<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.440">holdLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.446">holdLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#holdLock-TEnvironment-">Procedure</a></code></span></div>
<div class="block">Used to keep the procedure lock even when the procedure is yielding or suspended.
Must implement <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#hasLock-TEnvironment-"><code>Procedure.hasLock(Object)</code></a> if you want to hold the lock for life
@@ -1017,7 +1032,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>hasLock</h4>
-<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.445">hasLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.451">hasLock</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#hasLock-TEnvironment-">Procedure</a></code></span></div>
<div class="block">This is used in conjunction with <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#holdLock-TEnvironment-"><code>Procedure.holdLock(Object)</code></a>. If <a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#holdLock-TEnvironment-"><code>Procedure.holdLock(Object)</code></a>
returns true, the procedure executor will call acquireLock() once and thereafter
@@ -1039,7 +1054,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getTableName</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.450">getTableName</a>()</pre>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.456">getTableName</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.html#getTableName--">getTableName</a></code> in interface <code><a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.html" title="interface in org.apache.hadoop.hbase.master.procedure">TableProcedureInterface</a></code></dd>
@@ -1056,7 +1071,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getTableOperationType</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure">TableProcedureInterface.TableOperationType</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.455">getTableOperationType</a>()</pre>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure">TableProcedureInterface.TableOperationType</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.461">getTableOperationType</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.html#getTableOperationType--">TableProcedureInterface</a></code></span></div>
<div class="block">Given an operation type we can take decisions about what to do with pending operations.
e.g. if we get a delete and we have some table operation pending (e.g. add column)
@@ -1077,7 +1092,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getProcedureMetrics</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureMetrics.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureMetrics</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.460">getProcedureMetrics</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/procedure2/ProcedureMetrics.html" title="interface in org.apache.hadoop.hbase.procedure2">ProcedureMetrics</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.466">getProcedureMetrics</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#getProcedureMetrics-TEnvironment-">Procedure</a></code></span></div>
<div class="block">Override this method to provide procedure specific counters for submitted count, failed
count and time histogram.</div>
@@ -1091,13 +1106,51 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
</dl>
</li>
</ul>
+<a name="checkClosedRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkClosedRegions</h4>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.475">checkClosedRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">check the closed regions</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>env</code> - the master env</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - IOException</dd>
+</dl>
+</li>
+</ul>
+<a name="checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkClosedRegion</h4>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.488">checkClosedRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+ <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Check whether there is recovered.edits in the closed region
+ If any, that means this region is not closed property, we need
+ to abort region merge to prevent data loss</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>env</code> - master env</dd>
+<dd><code>regionInfo</code> - regioninfo</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - IOException</dd>
+</dl>
+</li>
+</ul>
<a name="prepareMergeRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>prepareMergeRegion</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.469">prepareMergeRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.502">prepareMergeRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Prepare merge and do some check</div>
<dl>
@@ -1114,7 +1167,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>isMergeable</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.536">isMergeable</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.569">isMergeable</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a> rs)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -1129,7 +1182,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>preMergeRegions</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.547">preMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.580">preMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Pre merge region action</div>
<dl>
@@ -1146,7 +1199,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>postRollBackMergeRegions</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.567">postRollBackMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.600">postRollBackMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Action after rollback a merge table regions action.</div>
<dl>
@@ -1163,7 +1216,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>setRegionStateToMerging</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.578">setRegionStateToMerging</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.611">setRegionStateToMerging</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block">Set the region states to MERGING state</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1177,7 +1230,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>createMergedRegion</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.589">createMergedRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.622">createMergedRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a merged region</div>
<dl>
@@ -1194,7 +1247,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>mergeStoreFiles</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.615">mergeStoreFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.648">mergeStoreFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
<a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionFileSystem.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionFileSystem</a> regionFs,
org.apache.hadoop.fs.Path mergedDir)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1215,7 +1268,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>cleanupMergedRegion</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.642">cleanupMergedRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.675">cleanupMergedRegion</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Clean up a merged region</div>
<dl>
@@ -1232,7 +1285,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>rollbackCloseRegionsForMerge</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.655">rollbackCloseRegionsForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.688">rollbackCloseRegionsForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Rollback close regions</div>
<dl>
@@ -1249,7 +1302,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>createUnassignProcedures</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/UnassignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">UnassignProcedure</a>[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.672">createUnassignProcedures</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/UnassignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">UnassignProcedure</a>[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.705">createUnassignProcedures</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
int regionReplication)</pre>
</li>
</ul>
@@ -1259,7 +1312,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>createAssignProcedures</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">AssignProcedure</a>[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.687">createAssignProcedures</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">AssignProcedure</a>[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.720">createAssignProcedures</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
int regionReplication)</pre>
</li>
</ul>
@@ -1269,7 +1322,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getRegionReplication</h4>
-<pre>private int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.698">getRegionReplication</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.731">getRegionReplication</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1283,7 +1336,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>preMergeRegionsCommit</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.707">preMergeRegionsCommit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.740">preMergeRegionsCommit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Post merge region action</div>
<dl>
@@ -1300,7 +1353,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>updateMetaForMergedRegions</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.728">updateMetaForMergedRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.761">updateMetaForMergedRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Add merged region to META and delete original regions.</div>
<dl>
@@ -1315,7 +1368,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>postMergeRegionsCommit</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.738">postMergeRegionsCommit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.771">postMergeRegionsCommit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Post merge region action</div>
<dl>
@@ -1332,7 +1385,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>postCompletedMergeRegions</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.749">postCompletedMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.782">postCompletedMergeRegions</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Post merge region action</div>
<dl>
@@ -1349,7 +1402,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getServerName</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.762">getServerName</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.795">getServerName</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block">The procedure could be restarted from a different machine. If the variable is null, we need to
retrieve it.</div>
<dl>
@@ -1366,7 +1419,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>writeMaxSequenceIdFile</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.774">writeMaxSequenceIdFile</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.807">writeMaxSequenceIdFile</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1380,7 +1433,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>isTraceEnabled</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.791">isTraceEnabled</a>()</pre>
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.824">isTraceEnabled</a>()</pre>
<div class="block">The procedure could be restarted from a different machine. If the variable is null, we need to
retrieve it.</div>
<dl>
@@ -1395,7 +1448,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockList">
<li class="blockList">
<h4>getMergedRegion</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.802">getMergedRegion</a>()</pre>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.835">getMergedRegion</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>The merged region. Maybe be null if called to early or we failed.</dd>
@@ -1408,7 +1461,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<ul class="blockListLast">
<li class="blockList">
<h4>abort</h4>
-<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.807">abort</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
+<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#line.840">abort</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html#abort-TEnvironment-">Procedure</a></code></span></div>
<div class="block">The abort() call is asynchronous and each procedure must decide how to deal
with it, if they want to be abortable. The simplest implementation
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html b/devapidocs/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
index 856f5d9..19f8fb2 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
@@ -292,7 +292,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegion</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Check whether there is recovered.edits in the closed region
If any, that means this region is not closed property, we need
- to abort region merge to prevent data loss</div>
+ to abort region split to prevent data loss</div>
</td>
</tr>
<tr id="i3" class="rowColor">
@@ -651,7 +651,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/procedure/Abst
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Check whether there is recovered.edits in the closed region
If any, that means this region is not closed property, we need
- to abort region merge to prevent data loss</div>
+ to abort region split to prevent data loss</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>env</code> - master env</dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 399add3..247b56e 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -348,11 +348,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html
index 80ad141..0de3ee4 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html
@@ -227,9 +227,24 @@
<td class="colLast"><span class="typeNameLabel">SplitTableRegionProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegion</a></span>(<a href="../../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
<div class="block">Check whether there is recovered.edits in the closed region
If any, that means this region is not closed property, we need
+ to abort region split to prevent data loss</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegion-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo-">checkClosedRegion</a></span>(<a href="../../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
+ <a href="../../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</code>
+<div class="block">Check whether there is recovered.edits in the closed region
+ If any, that means this region is not closed property, we need
to abort region merge to prevent data loss</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkClosedRegions-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-">checkClosedRegions</a></span>(<a href="../../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env)</code>
+<div class="block">check the closed regions</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><span class="typeNameLabel">MergeTableRegionsProcedure.</span><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html#checkRegionsToMerge-org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv-org.apache.hadoop.hbase.client.RegionInfo:A-boolean-">checkRegionsToMerge</a></span>(<a href="../../../../../../../org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureEnv</a> env,
[02/11] hbase-site git commit: Published site at
a888af3dc9320a5dc3c2e41e46e31522c7a0e356.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/88a2fa46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/StringRange.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/StringRange.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/StringRange.html
index 1648ba3..570477d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/StringRange.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/StringRange.html
@@ -27,264 +27,296 @@
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import static org.junit.Assert.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.ArrayList;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.HashMap;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.HashSet;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Objects;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.TableName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Put;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Result;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Table;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.FilterTests;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.After;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.AfterClass;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.Before;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.ClassRule;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.Rule;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.rules.TestName;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.slf4j.Logger;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>class StringRange {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private String start = null;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private String end = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private boolean startInclusive = true;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> private boolean endInclusive = false;<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> public StringRange(String start, boolean startInclusive, String end,<a name="line.63"></a>
-<span class="sourceLineNo">064</span> boolean endInclusive) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> this.start = start;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> this.startInclusive = startInclusive;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> this.end = end;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.endInclusive = endInclusive;<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 String getStart() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return this.start;<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 String getEnd() {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> return this.end;<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 isStartInclusive() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return this.startInclusive;<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 isEndInclusive() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return this.endInclusive;<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> @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public int hashCode() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> int hashCode = 0;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> if (this.start != null) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> hashCode ^= this.start.hashCode();<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> if (this.end != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> hashCode ^= this.end.hashCode();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return hashCode;<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> @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean equals(Object obj) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (this == obj) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return true;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (obj == null) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> return false;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span> if (!(obj instanceof StringRange)) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return false;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> StringRange oth = (StringRange) obj;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> return this.startInclusive == oth.startInclusive &&<a name="line.112"></a>
-<span class="sourceLineNo">113</span> this.endInclusive == oth.endInclusive &&<a name="line.113"></a>
-<span class="sourceLineNo">114</span> Objects.equals(this.start, oth.start) &&<a name="line.114"></a>
-<span class="sourceLineNo">115</span> Objects.equals(this.end, oth.end);<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> @Override<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public String toString() {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> String result = (this.startInclusive ? "[" : "(")<a name="line.120"></a>
-<span class="sourceLineNo">121</span> + (this.start == null ? null : this.start) + ", "<a name="line.121"></a>
-<span class="sourceLineNo">122</span> + (this.end == null ? null : this.end)<a name="line.122"></a>
-<span class="sourceLineNo">123</span> + (this.endInclusive ? "]" : ")");<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return result;<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> public boolean inRange(String value) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> boolean afterStart = true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (this.start != null) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> int startCmp = value.compareTo(this.start);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> afterStart = this.startInclusive ? startCmp >= 0 : startCmp > 0;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> boolean beforeEnd = true;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (this.end != null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> int endCmp = value.compareTo(this.end);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> beforeEnd = this.endInclusive ? endCmp <= 0 : endCmp < 0;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> return afterStart && beforeEnd;<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>}<a name="line.143"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.ArrayList;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.HashMap;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.HashSet;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Map;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.Objects;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.Cell;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.KeyValueTestUtil;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Put;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Result;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Table;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.filter.FilterList.Operator;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.FilterTests;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.After;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.AfterClass;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.Before;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.BeforeClass;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.ClassRule;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.Rule;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.rules.TestName;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.Logger;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.LoggerFactory;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>class StringRange {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private String start = null;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private String end = null;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private boolean startInclusive = true;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private boolean endInclusive = false;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> public StringRange(String start, boolean startInclusive, String end,<a name="line.65"></a>
+<span class="sourceLineNo">066</span> boolean endInclusive) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> this.start = start;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> this.startInclusive = startInclusive;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.end = end;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> this.endInclusive = endInclusive;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> public String getStart() {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return this.start;<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> public String getEnd() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> return this.end;<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> public boolean isStartInclusive() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return this.startInclusive;<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 boolean isEndInclusive() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return this.endInclusive;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public int hashCode() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> int hashCode = 0;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> if (this.start != null) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> hashCode ^= this.start.hashCode();<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> if (this.end != null) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> hashCode ^= this.end.hashCode();<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return hashCode;<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> @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public boolean equals(Object obj) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (this == obj) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> return true;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span> if (obj == null) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return false;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> if (!(obj instanceof StringRange)) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return false;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> StringRange oth = (StringRange) obj;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return this.startInclusive == oth.startInclusive &&<a name="line.114"></a>
+<span class="sourceLineNo">115</span> this.endInclusive == oth.endInclusive &&<a name="line.115"></a>
+<span class="sourceLineNo">116</span> Objects.equals(this.start, oth.start) &&<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Objects.equals(this.end, oth.end);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> @Override<a name="line.120"></a>
+<span class="sourceLineNo">121</span> public String toString() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> String result = (this.startInclusive ? "[" : "(")<a name="line.122"></a>
+<span class="sourceLineNo">123</span> + (this.start == null ? null : this.start) + ", "<a name="line.123"></a>
+<span class="sourceLineNo">124</span> + (this.end == null ? null : this.end)<a name="line.124"></a>
+<span class="sourceLineNo">125</span> + (this.endInclusive ? "]" : ")");<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return result;<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 boolean inRange(String value) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> boolean afterStart = true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (this.start != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> int startCmp = value.compareTo(this.start);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> afterStart = this.startInclusive ? startCmp >= 0 : startCmp > 0;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> boolean beforeEnd = true;<a name="line.136"></a>
+<span class="sourceLineNo">137</span> if (this.end != null) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> int endCmp = value.compareTo(this.end);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> beforeEnd = this.endInclusive ? endCmp <= 0 : endCmp < 0;<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> return afterStart && beforeEnd;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>@Category({FilterTests.class, MediumTests.class})<a name="line.146"></a>
-<span class="sourceLineNo">147</span>public class TestColumnRangeFilter {<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> @ClassRule<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.150"></a>
-<span class="sourceLineNo">151</span> HBaseClassTestRule.forClass(TestColumnRangeFilter.class);<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.153"></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><a name="line.147"></a>
+<span class="sourceLineNo">148</span>@Category({FilterTests.class, MediumTests.class})<a name="line.148"></a>
+<span class="sourceLineNo">149</span>public class TestColumnRangeFilter {<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> @ClassRule<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.152"></a>
+<span class="sourceLineNo">153</span> HBaseClassTestRule.forClass(TestColumnRangeFilter.class);<a name="line.153"></a>
<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> private static final Logger LOG = LoggerFactory.getLogger(TestColumnRangeFilter.class);<a name="line.155"></a>
+<span class="sourceLineNo">155</span> private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.155"></a>
<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> @Rule<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public TestName name = new TestName();<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @BeforeClass<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public static void setUpBeforeClass() throws Exception {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> TEST_UTIL.startMiniCluster();<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> @AfterClass<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public static void tearDownAfterClass() throws Exception {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> TEST_UTIL.shutdownMiniCluster();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> @Before<a name="line.170"></a>
-<span class="sourceLineNo">171</span> public void setUp() throws Exception {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Nothing to do.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> @After<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public void tearDown() throws Exception {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // Nothing to do.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> @Test<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public void TestColumnRangeFilterClient() throws Exception {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> String family = "Family";<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Table ht = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.183"></a>
-<span class="sourceLineNo">184</span> Bytes.toBytes(family), Integer.MAX_VALUE);<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> List<String> rows = generateRandomWords(10, 8);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> long maxTimestamp = 2;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> List<String> columns = generateRandomWords(20000, 8);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> List<KeyValue> kvList = new ArrayList<>();<a name="line.190"></a>
+<span class="sourceLineNo">157</span> private static final Logger LOG = LoggerFactory.getLogger(TestColumnRangeFilter.class);<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> @Rule<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public TestName name = new TestName();<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @BeforeClass<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public static void setUpBeforeClass() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> TEST_UTIL.startMiniCluster();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> @AfterClass<a name="line.167"></a>
+<span class="sourceLineNo">168</span> public static void tearDownAfterClass() throws Exception {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> TEST_UTIL.shutdownMiniCluster();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> @Before<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public void setUp() throws Exception {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Nothing to do.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> @After<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public void tearDown() throws Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // Nothing to do.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> @Test<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public void TestColumnRangeFilterClient() throws Exception {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> String family = "Family";<a name="line.184"></a>
+<span class="sourceLineNo">185</span> Table ht = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.185"></a>
+<span class="sourceLineNo">186</span> Bytes.toBytes(family), Integer.MAX_VALUE);<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> List<String> rows = generateRandomWords(10, 8);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> long maxTimestamp = 2;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> List<String> columns = generateRandomWords(20000, 8);<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> Map<StringRange, List<KeyValue>> rangeMap = new HashMap<>();<a name="line.192"></a>
+<span class="sourceLineNo">192</span> List<KeyValue> kvList = new ArrayList<>();<a name="line.192"></a>
<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> rangeMap.put(new StringRange(null, true, "b", false),<a name="line.194"></a>
-<span class="sourceLineNo">195</span> new ArrayList<>());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> rangeMap.put(new StringRange("p", true, "q", false),<a name="line.196"></a>
+<span class="sourceLineNo">194</span> Map<StringRange, List<KeyValue>> rangeMap = new HashMap<>();<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> rangeMap.put(new StringRange(null, true, "b", false),<a name="line.196"></a>
<span class="sourceLineNo">197</span> new ArrayList<>());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> rangeMap.put(new StringRange("r", false, "s", true),<a name="line.198"></a>
+<span class="sourceLineNo">198</span> rangeMap.put(new StringRange("p", true, "q", false),<a name="line.198"></a>
<span class="sourceLineNo">199</span> new ArrayList<>());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> rangeMap.put(new StringRange("z", false, null, false),<a name="line.200"></a>
+<span class="sourceLineNo">200</span> rangeMap.put(new StringRange("r", false, "s", true),<a name="line.200"></a>
<span class="sourceLineNo">201</span> new ArrayList<>());<a name="line.201"></a>
-<span class="sourceLineNo">202</span> String valueString = "ValueString";<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> for (String row : rows) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Put p = new Put(Bytes.toBytes(row));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> p.setDurability(Durability.SKIP_WAL);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> for (String column : columns) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> for (long timestamp = 1; timestamp <= maxTimestamp; timestamp++) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> KeyValue kv = KeyValueTestUtil.create(row, family, column, timestamp,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> valueString);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> p.add(kv);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> kvList.add(kv);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> for (StringRange s : rangeMap.keySet()) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> if (s.inRange(column)) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> rangeMap.get(s).add(kv);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> ht.put(p);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> TEST_UTIL.flush();<a name="line.223"></a>
+<span class="sourceLineNo">202</span> rangeMap.put(new StringRange("z", false, null, false),<a name="line.202"></a>
+<span class="sourceLineNo">203</span> new ArrayList<>());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> String valueString = "ValueString";<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> for (String row : rows) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Put p = new Put(Bytes.toBytes(row));<a name="line.207"></a>
+<span class="sourceLineNo">208</span> p.setDurability(Durability.SKIP_WAL);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> for (String column : columns) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> for (long timestamp = 1; timestamp <= maxTimestamp; timestamp++) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> KeyValue kv = KeyValueTestUtil.create(row, family, column, timestamp,<a name="line.211"></a>
+<span class="sourceLineNo">212</span> valueString);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> p.add(kv);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> kvList.add(kv);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> for (StringRange s : rangeMap.keySet()) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (s.inRange(column)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> rangeMap.get(s).add(kv);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> ht.put(p);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> ColumnRangeFilter filter;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> Scan scan = new Scan();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> scan.setMaxVersions();<a name="line.227"></a>
-<span class="sourceLineNo">228</span> for (StringRange s : rangeMap.keySet()) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> filter = new ColumnRangeFilter(s.getStart() == null ? null<a name="line.229"></a>
-<span class="sourceLineNo">230</span> : Bytes.toBytes(s.getStart()), s.isStartInclusive(),<a name="line.230"></a>
-<span class="sourceLineNo">231</span> s.getEnd() == null ? null : Bytes.toBytes(s.getEnd()),<a name="line.231"></a>
-<span class="sourceLineNo">232</span> s.isEndInclusive());<a name="line.232"></a>
-<span class="sourceLineNo">233</span> scan.setFilter(filter);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> ResultScanner scanner = ht.getScanner(scan);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> List<Cell> results = new ArrayList<>();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.info("scan column range: " + s.toString());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> long timeBeforeScan = System.currentTimeMillis();<a name="line.237"></a>
+<span class="sourceLineNo">225</span> TEST_UTIL.flush();<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> ColumnRangeFilter filter;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> Scan scan = new Scan();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> scan.setMaxVersions();<a name="line.229"></a>
+<span class="sourceLineNo">230</span> for (StringRange s : rangeMap.keySet()) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> filter = new ColumnRangeFilter(s.getStart() == null ? null : Bytes.toBytes(s.getStart()),<a name="line.231"></a>
+<span class="sourceLineNo">232</span> s.isStartInclusive(), s.getEnd() == null ? null : Bytes.toBytes(s.getEnd()),<a name="line.232"></a>
+<span class="sourceLineNo">233</span> s.isEndInclusive());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> assertEquals(rangeMap.get(s).size(), cellsCount(ht, filter));<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span> ht.close();<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> Result result;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> while ((result = scanner.next()) != null) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> for (Cell kv : result.listCells()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> results.add(kv);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> long scanTime = System.currentTimeMillis() - timeBeforeScan;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> scanner.close();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> LOG.info("scan time = " + scanTime + "ms");<a name="line.247"></a>
-<span class="sourceLineNo">248</span> LOG.info("found " + results.size() + " results");<a name="line.248"></a>
-<span class="sourceLineNo">249</span> LOG.info("Expecting " + rangeMap.get(s).size() + " results");<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> for (KeyValue kv : results) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> LOG.info("found row " + Bytes.toString(kv.getRow()) + ", column "<a name="line.253"></a>
-<span class="sourceLineNo">254</span> + Bytes.toString(kv.getQualifier()));<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> */<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> assertEquals(rangeMap.get(s).size(), results.size());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ht.close();<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> List<String> generateRandomWords(int numberOfWords, int maxLengthOfWords) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> Set<String> wordSet = new HashSet<>();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> for (int i = 0; i < numberOfWords; i++) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> int lengthOfWords = (int) (Math.random() * maxLengthOfWords) + 1;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> char[] wordChar = new char[lengthOfWords];<a name="line.267"></a>
-<span class="sourceLineNo">268</span> for (int j = 0; j < wordChar.length; j++) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> wordChar[j] = (char) (Math.random() * 26 + 97);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> String word = new String(wordChar);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> wordSet.add(word);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> List<String> wordList = new ArrayList<>(wordSet);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return wordList;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>}<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">239</span> @Test<a name="line.239"></a>
+<span class="sourceLineNo">240</span> public void TestColumnRangeFilterWithColumnPaginationFilter() throws Exception {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> String family = "Family";<a name="line.241"></a>
+<span class="sourceLineNo">242</span> String table = "TestColumnRangeFilterWithColumnPaginationFilter";<a name="line.242"></a>
+<span class="sourceLineNo">243</span> try (Table ht =<a name="line.243"></a>
+<span class="sourceLineNo">244</span> TEST_UTIL.createTable(TableName.valueOf(table), Bytes.toBytes(family), Integer.MAX_VALUE)) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> // one row.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> String row = "row";<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // One version<a name="line.247"></a>
+<span class="sourceLineNo">248</span> long timestamp = 100;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // 10 columns<a name="line.249"></a>
+<span class="sourceLineNo">250</span> int[] columns = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };<a name="line.250"></a>
+<span class="sourceLineNo">251</span> String valueString = "ValueString";<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> Put p = new Put(Bytes.toBytes(row));<a name="line.253"></a>
+<span class="sourceLineNo">254</span> p.setDurability(Durability.SKIP_WAL);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> for (int column : columns) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> KeyValue kv =<a name="line.256"></a>
+<span class="sourceLineNo">257</span> KeyValueTestUtil.create(row, family, Integer.toString(column), timestamp, valueString);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> p.add(kv);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> ht.put(p);<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> TEST_UTIL.flush();<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> // Column range from 1 to 9.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> StringRange stringRange = new StringRange("1", true, "9", false);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> ColumnRangeFilter filter1 = new ColumnRangeFilter(Bytes.toBytes(stringRange.getStart()),<a name="line.266"></a>
+<span class="sourceLineNo">267</span> stringRange.isStartInclusive(), Bytes.toBytes(stringRange.getEnd()),<a name="line.267"></a>
+<span class="sourceLineNo">268</span> stringRange.isEndInclusive());<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> ColumnPaginationFilter filter2 = new ColumnPaginationFilter(5, 0);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> ColumnPaginationFilter filter3 = new ColumnPaginationFilter(5, 1);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ColumnPaginationFilter filter4 = new ColumnPaginationFilter(5, 2);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ColumnPaginationFilter filter5 = new ColumnPaginationFilter(5, 6);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> ColumnPaginationFilter filter6 = new ColumnPaginationFilter(5, 9);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter2)));<a name="line.275"></a>
+<span class="sourceLineNo">276</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter3)));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> assertEquals(5, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter4)));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals(2, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter5)));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertEquals(0, cellsCount(ht, new FilterList(Operator.MUST_PASS_ALL, filter1, filter6)));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> private int cellsCount(Table table, Filter filter) throws IOException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Scan scan = new Scan().setFilter(filter).readAllVersions();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> List<Cell> results = new ArrayList<>();<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Result result;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> while ((result = scanner.next()) != null) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> result.listCells().forEach(results::add);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return results.size();<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> List<String> generateRandomWords(int numberOfWords, int maxLengthOfWords) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Set<String> wordSet = new HashSet<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (int i = 0; i < numberOfWords; i++) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> int lengthOfWords = (int) (Math.random() * maxLengthOfWords) + 1;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> char[] wordChar = new char[lengthOfWords];<a name="line.299"></a>
+<span class="sourceLineNo">300</span> for (int j = 0; j < wordChar.length; j++) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> wordChar[j] = (char) (Math.random() * 26 + 97);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> String word = new String(wordChar);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> wordSet.add(word);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span> List<String> wordList = new ArrayList<>(wordSet);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return wordList;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>