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>
