hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [22/51] [partial] hbase-site git commit: Published site at c6a65ba63fce85ac7c4b62b96ef2bbe6c35d2f00.
Date Tue, 04 Sep 2018 14:48:11 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/QualifierFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/QualifierFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/QualifierFilter.html
index 3f90c7c..7d25b42 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/QualifierFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/QualifierFilter.html
@@ -29,144 +29,139 @@
 <span class="sourceLineNo">021</span><a name="line.21"></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.Objects;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * This filter is used to filter based on the column qualifier. It takes an<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * operator (equal, greater, not equal, etc) and a byte [] comparator for the<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * column qualifier portion of a key.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * This filter can be wrapped with {@link WhileMatchFilter} and {@link SkipFilter}<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * to add more control.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Multiple filters can be combined using {@link FilterList}.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * If an already known column qualifier is looked for, <a name="line.44"></a>
-<span class="sourceLineNo">045</span> * use {@link org.apache.hadoop.hbase.client.Get#addColumn}<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * directly rather than a filter.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@InterfaceAudience.Public<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class QualifierFilter extends CompareFilter {<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>  /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * Constructor.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * @param op the compare op for column qualifier matching<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * @param qualifierComparator the comparator for column qualifier matching<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Use {@link #QualifierFilter(CompareOperator, ByteArrayComparable)} instead.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @Deprecated<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public QualifierFilter(final CompareOp op,<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      final ByteArrayComparable qualifierComparator) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    super(op, qualifierComparator);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * Constructor.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * @param op the compare op for column qualifier matching<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * @param qualifierComparator the comparator for column qualifier matching<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public QualifierFilter(final CompareOperator op,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>                         final ByteArrayComparable qualifierComparator) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    super(op, qualifierComparator);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  @Deprecated<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public ReturnCode filterKeyValue(final Cell c) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    return filterCell(c);<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>  @Override<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public ReturnCode filterCell(final Cell c) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    int qualifierLength = c.getQualifierLength();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    if (qualifierLength &gt; 0) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      if (compareQualifier(getCompareOperator(), this.comparator, c)) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        return ReturnCode.SKIP;<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>    return ReturnCode.INCLUDE;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    ArrayList&lt;?&gt; arguments = CompareFilter.extractArguments(filterArguments);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    return new QualifierFilter(compareOp, comparator);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @return The filter serialized using pb<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public byte [] toByteArray() {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    FilterProtos.QualifierFilter.Builder builder =<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      FilterProtos.QualifierFilter.newBuilder();<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    builder.setCompareFilter(super.convert());<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    return builder.build().toByteArray();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @param pbBytes A pb serialized {@link QualifierFilter} instance<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * @return An instance of {@link QualifierFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @see #toByteArray<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public static QualifierFilter parseFrom(final byte [] pbBytes)<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  throws DeserializationException {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    FilterProtos.QualifierFilter proto;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    try {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      proto = FilterProtos.QualifierFilter.parseFrom(pbBytes);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    } catch (InvalidProtocolBufferException e) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      throw new DeserializationException(e);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    final CompareOperator valueCompareOp =<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    ByteArrayComparable valueComparator = null;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    try {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    } catch (IOException ioe) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throw new DeserializationException(ioe);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return new QualifierFilter(valueCompareOp,valueComparator);<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>  /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    if (o == this) return true;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    if (!(o instanceof QualifierFilter)) return false;<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return super.areSerializedFieldsEqual(o);<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>  @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public boolean equals(Object obj) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    if (obj == null || (!(obj instanceof QualifierFilter))) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return false;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    QualifierFilter f = (QualifierFilter) obj;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return this.areSerializedFieldsEqual(f);<a name="line.154"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Cell;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * This filter is used to filter based on the column qualifier. It takes an<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * operator (equal, greater, not equal, etc) and a byte [] comparator for the<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * column qualifier portion of a key.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * &lt;p&gt;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * This filter can be wrapped with {@link WhileMatchFilter} and {@link SkipFilter}<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * to add more control.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Multiple filters can be combined using {@link FilterList}.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * &lt;p&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * If an already known column qualifier is looked for, <a name="line.43"></a>
+<span class="sourceLineNo">044</span> * use {@link org.apache.hadoop.hbase.client.Get#addColumn}<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * directly rather than a filter.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@InterfaceAudience.Public<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public class QualifierFilter extends CompareFilter {<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>   * Constructor.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * @param op the compare op for column qualifier matching<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @param qualifierComparator the comparator for column qualifier matching<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * Use {@link #QualifierFilter(CompareOperator, ByteArrayComparable)} instead.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @Deprecated<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public QualifierFilter(final CompareOp op,<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      final ByteArrayComparable qualifierComparator) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    super(op, qualifierComparator);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  /**<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   * Constructor.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @param op the compare op for column qualifier matching<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param qualifierComparator the comparator for column qualifier matching<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public QualifierFilter(final CompareOperator op,<a name="line.68"></a>
+<span class="sourceLineNo">069</span>                         final ByteArrayComparable qualifierComparator) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    super(op, qualifierComparator);<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>  @Deprecated<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public ReturnCode filterKeyValue(final Cell c) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    return filterCell(c);<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>  @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public ReturnCode filterCell(final Cell c) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    int qualifierLength = c.getQualifierLength();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    if (qualifierLength &gt; 0) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      if (compareQualifier(getCompareOperator(), this.comparator, c)) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        return ReturnCode.SKIP;<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>    return ReturnCode.INCLUDE;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    ArrayList&lt;?&gt; arguments = CompareFilter.extractArguments(filterArguments);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    return new QualifierFilter(compareOp, comparator);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * @return The filter serialized using pb<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 byte [] toByteArray() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    FilterProtos.QualifierFilter.Builder builder =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      FilterProtos.QualifierFilter.newBuilder();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    builder.setCompareFilter(super.convert());<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    return builder.build().toByteArray();<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * @param pbBytes A pb serialized {@link QualifierFilter} instance<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * @return An instance of {@link QualifierFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * @see #toByteArray<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public static QualifierFilter parseFrom(final byte [] pbBytes)<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  throws DeserializationException {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    FilterProtos.QualifierFilter proto;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    try {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      proto = FilterProtos.QualifierFilter.parseFrom(pbBytes);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    } catch (InvalidProtocolBufferException e) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      throw new DeserializationException(e);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    final CompareOperator valueCompareOp =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    ByteArrayComparable valueComparator = null;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    try {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    } catch (IOException ioe) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      throw new DeserializationException(ioe);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    return new QualifierFilter(valueCompareOp,valueComparator);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<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>   * @return true if and only if the fields of the filter that are serialized<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    if (o == this) return true;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    if (!(o instanceof QualifierFilter)) return false;<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    return super.areSerializedFieldsEqual(o);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>  @Override<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  public boolean equals(Object obj) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  public int hashCode() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    return super.hashCode();<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 int hashCode() {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    return Objects.hash(this.getComparator(), this.getCompareOperator());<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">156</span>}<a name="line.156"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
index c5cdc25..a340363 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
@@ -166,18 +166,14 @@
 <span class="sourceLineNo">158</span><a name="line.158"></a>
 <span class="sourceLineNo">159</span>  @Override<a name="line.159"></a>
 <span class="sourceLineNo">160</span>  public boolean equals(Object obj) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    if (obj == null || (!(obj instanceof RandomRowFilter))) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      return false;<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    RandomRowFilter f = (RandomRowFilter) obj;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return this.areSerializedFieldsEqual(f);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  public int hashCode() {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    return Objects.hash(this.getChance());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>}<a name="line.172"></a>
+<span class="sourceLineNo">161</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public int hashCode() {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    return Objects.hash(this.getChance());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>}<a name="line.168"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
index 14fcebb..7d6a4fe 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
@@ -29,161 +29,156 @@
 <span class="sourceLineNo">021</span><a name="line.21"></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.Objects;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * This filter is used to filter based on the key. It takes an operator<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * (equal, greater, not equal, etc) and a byte [] comparator for the row,<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * and column qualifier portions of a key.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * This filter can be wrapped with {@link WhileMatchFilter} to add more control.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * Multiple filters can be combined using {@link FilterList}.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;p&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * If an already known row range needs to be scanned, <a name="line.43"></a>
-<span class="sourceLineNo">044</span> * use {@link org.apache.hadoop.hbase.CellScanner} start<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * and stop rows directly rather than a filter.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@InterfaceAudience.Public<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class RowFilter extends CompareFilter {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  private boolean filterOutRow = false;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * Constructor.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * @param rowCompareOp the compare op for row matching<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * @param rowComparator the comparator for row matching<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * @deprecated Since 2.0.0. Will remove in 3.0.0. Use<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * {@link #RowFilter(CompareOperator, ByteArrayComparable)}} instead.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Deprecated<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public RowFilter(final CompareOp rowCompareOp,<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      final ByteArrayComparable rowComparator) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    super(rowCompareOp, rowComparator);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * Constructor.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * @param op the compare op for row matching<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * @param rowComparator the comparator for row matching<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public RowFilter(final CompareOperator op,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>                   final ByteArrayComparable rowComparator) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    super(op, rowComparator);<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>  @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public void reset() {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    this.filterOutRow = false;<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>  @Deprecated<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public ReturnCode filterKeyValue(final Cell c) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    return filterCell(c);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public ReturnCode filterCell(final Cell v) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    if(this.filterOutRow) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      return ReturnCode.NEXT_ROW;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    return ReturnCode.INCLUDE;<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>  @Override<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public boolean filterRowKey(Cell firstRowCell) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    if (compareRow(getCompareOperator(), this.comparator, firstRowCell)) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      this.filterOutRow = true;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    return this.filterOutRow;<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 filterRow() {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return this.filterOutRow;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    @SuppressWarnings("rawtypes") // for arguments<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    ArrayList arguments = CompareFilter.extractArguments(filterArguments);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    return new RowFilter(compareOp, comparator);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  * @return The filter serialized using pb<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 byte [] toByteArray() {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    FilterProtos.RowFilter.Builder builder =<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      FilterProtos.RowFilter.newBuilder();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    builder.setCompareFilter(super.convert());<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    return builder.build().toByteArray();<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>   * @param pbBytes A pb serialized {@link RowFilter} instance<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   * @return An instance of {@link RowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * @throws DeserializationException<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * @see #toByteArray<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public static RowFilter parseFrom(final byte [] pbBytes)<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  throws DeserializationException {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    FilterProtos.RowFilter proto;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      proto = FilterProtos.RowFilter.parseFrom(pbBytes);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    } catch (InvalidProtocolBufferException e) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      throw new DeserializationException(e);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    final CompareOperator valueCompareOp =<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    ByteArrayComparable valueComparator = null;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    } catch (IOException ioe) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      throw new DeserializationException(ioe);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    return new RowFilter(valueCompareOp,valueComparator);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   * are equal to the corresponding fields in other.  Used for testing.<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>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    if (o == this) return true;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    if (!(o instanceof RowFilter)) return false;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    return super.areSerializedFieldsEqual(o);<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>  @Override<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  public boolean equals(Object obj) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    if (obj == null || (!(obj instanceof RowFilter))) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      return false;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    RowFilter f = (RowFilter) obj;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    return this.areSerializedFieldsEqual(f);<a name="line.171"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Cell;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * This filter is used to filter based on the key. It takes an operator<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * (equal, greater, not equal, etc) and a byte [] comparator for the row,<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * and column qualifier portions of a key.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * &lt;p&gt;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * This filter can be wrapped with {@link WhileMatchFilter} to add more control.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;p&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Multiple filters can be combined using {@link FilterList}.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * If an already known row range needs to be scanned, <a name="line.42"></a>
+<span class="sourceLineNo">043</span> * use {@link org.apache.hadoop.hbase.CellScanner} start<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * and stop rows directly rather than a filter.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Public<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class RowFilter extends CompareFilter {<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private boolean filterOutRow = false;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  /**<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * Constructor.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @param rowCompareOp the compare op for row matching<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * @param rowComparator the comparator for row matching<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * @deprecated Since 2.0.0. Will remove in 3.0.0. Use<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * {@link #RowFilter(CompareOperator, ByteArrayComparable)}} instead.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Deprecated<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public RowFilter(final CompareOp rowCompareOp,<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      final ByteArrayComparable rowComparator) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    super(rowCompareOp, rowComparator);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * Constructor.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param op the compare op for row matching<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param rowComparator the comparator for row matching<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public RowFilter(final CompareOperator op,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>                   final ByteArrayComparable rowComparator) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    super(op, rowComparator);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public void reset() {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    this.filterOutRow = false;<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>  @Deprecated<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public ReturnCode filterKeyValue(final Cell c) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    return filterCell(c);<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>  @Override<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public ReturnCode filterCell(final Cell v) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    if(this.filterOutRow) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      return ReturnCode.NEXT_ROW;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    return ReturnCode.INCLUDE;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public boolean filterRowKey(Cell firstRowCell) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (compareRow(getCompareOperator(), this.comparator, firstRowCell)) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      this.filterOutRow = true;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    return this.filterOutRow;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public boolean filterRow() {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    return this.filterOutRow;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    @SuppressWarnings("rawtypes") // for arguments<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    ArrayList arguments = CompareFilter.extractArguments(filterArguments);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return new RowFilter(compareOp, comparator);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  * @return The filter serialized using pb<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  public byte [] toByteArray() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    FilterProtos.RowFilter.Builder builder =<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      FilterProtos.RowFilter.newBuilder();<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    builder.setCompareFilter(super.convert());<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    return builder.build().toByteArray();<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>   * @param pbBytes A pb serialized {@link RowFilter} instance<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @return An instance of {@link RowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @throws DeserializationException<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * @see #toByteArray<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  public static RowFilter parseFrom(final byte [] pbBytes)<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  throws DeserializationException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    FilterProtos.RowFilter proto;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      proto = FilterProtos.RowFilter.parseFrom(pbBytes);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    } catch (InvalidProtocolBufferException e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      throw new DeserializationException(e);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    final CompareOperator valueCompareOp =<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    ByteArrayComparable valueComparator = null;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    try {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    } catch (IOException ioe) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      throw new DeserializationException(ioe);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return new RowFilter(valueCompareOp,valueComparator);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    if (o == this) return true;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (!(o instanceof RowFilter)) return false;<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return super.areSerializedFieldsEqual(o);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public boolean equals(Object obj) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  public int hashCode() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    return super.hashCode();<a name="line.171"></a>
 <span class="sourceLineNo">172</span>  }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>  @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  public int hashCode() {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    return Objects.hash(this.getComparator(), this.getCompareOperator());<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>}<a name="line.178"></a>
+<span class="sourceLineNo">173</span>}<a name="line.173"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.html
index 149a3c4..9b92ab0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.html
@@ -249,7 +249,17 @@
 <span class="sourceLineNo">241</span><a name="line.241"></a>
 <span class="sourceLineNo">242</span>    return super.areSerializedFieldsEqual(o);<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">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>  @Override<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  public boolean equals(Object obj) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>  @Override<a name="line.250"></a>
+<span class="sourceLineNo">251</span>  public int hashCode() {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    return super.hashCode();<a name="line.252"></a>
+<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>}<a name="line.254"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
index 67b265c..fd55017 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
@@ -472,19 +472,15 @@
 <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>  public boolean equals(Object obj) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    if (obj == null || (!(SingleColumnValueFilter.class.isInstance(obj)))) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      return false;<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    }<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    SingleColumnValueFilter f = (SingleColumnValueFilter) obj;<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    return this.areSerializedFieldsEqual(f);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>  }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>  @Override<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  public int hashCode() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    return Objects.hash(Bytes.hashCode(this.getFamily()), Bytes.hashCode(this.getQualifier()),<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      this.op, this.getComparator(), this.getFilterIfMissing(), this.getLatestVersionOnly());<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">467</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<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>  @Override<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public int hashCode() {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    return Objects.hash(Bytes.hashCode(getFamily()), Bytes.hashCode(getQualifier()),<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      this.op, getComparator(), getFilterIfMissing(), getLatestVersionOnly());<a name="line.473"></a>
+<span class="sourceLineNo">474</span>  }<a name="line.474"></a>
+<span class="sourceLineNo">475</span>}<a name="line.475"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
index 9a40948..b763e4f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
@@ -173,18 +173,14 @@
 <span class="sourceLineNo">165</span><a name="line.165"></a>
 <span class="sourceLineNo">166</span>  @Override<a name="line.166"></a>
 <span class="sourceLineNo">167</span>  public boolean equals(Object obj) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    if (obj == null || (!(obj.getClass() == this.getClass()))) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      return false;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    SkipFilter f = (SkipFilter) obj;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    return this.areSerializedFieldsEqual(f);<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>  @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  public int hashCode() {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    return Objects.hash(this.filter);<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">168</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  @Override<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  public int hashCode() {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    return Objects.hash(this.filter);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>}<a name="line.175"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/293abb17/devapidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
index 076540c..6abe8c6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
@@ -250,18 +250,14 @@
 <span class="sourceLineNo">242</span><a name="line.242"></a>
 <span class="sourceLineNo">243</span>  @Override<a name="line.243"></a>
 <span class="sourceLineNo">244</span>  public boolean equals(Object obj) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    if (obj == null || (!(obj instanceof TimestampsFilter))) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      return false;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    TimestampsFilter f = (TimestampsFilter) obj;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    return this.areSerializedFieldsEqual(f);<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>  @Override<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  public int hashCode() {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    return Objects.hash(this.getTimestamps().toArray());<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">245</span>    return obj instanceof Filter &amp;&amp; areSerializedFieldsEqual((Filter) obj);<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>  @Override<a name="line.248"></a>
+<span class="sourceLineNo">249</span>  public int hashCode() {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    return Objects.hash(getTimestamps());<a name="line.250"></a>
+<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>}<a name="line.252"></a>
 
 
 


Mime
View raw message