http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
index 97df5d5..4f8ff6b 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
@@ -32,198 +32,203 @@
 <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.CellComparator;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * This is a generic filter to be used to 
filter by comparison.  It takes an<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * operator (equal, greater, not equal, 
etc) and a byte [] comparator.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * To filter by row key, use {@link 
RowFilter}.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * To filter by column qualifier, use 
{@link QualifierFilter}.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;p&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * To filter by value, use {@link 
SingleColumnValueFilter}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * &lt;p&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * These filters can be wrapped with 
{@link SkipFilter} and {@link WhileMatchFilter}<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * to add more control.<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;p&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Multiple filters can be combined using 
{@link FilterList}.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@InterfaceAudience.Public<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>public abstract class CompareFilter 
extends FilterBase {<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  /** Comparison operators. */<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>  @InterfaceAudience.Public<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  public enum CompareOp {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    /** less than */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    LESS,<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    /** less than or equal to */<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    LESS_OR_EQUAL,<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    /** equals */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    EQUAL,<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    /** not equal */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    NOT_EQUAL,<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    /** greater than or equal to */<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>    GREATER_OR_EQUAL,<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    /** greater than */<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    GREATER,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    /** no operation */<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    NO_OP,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  protected CompareOp compareOp;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  protected ByteArrayComparable 
comparator;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * Constructor.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * @param compareOp the compare op for 
row matching<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * @param comparator the comparator for 
row matching<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public CompareFilter(final CompareOp 
compareOp,<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      final ByteArrayComparable 
comparator) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    this.compareOp = compareOp;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    this.comparator = comparator;<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>  /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @return operator<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public CompareOp getOperator() {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    return compareOp;<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * @return the comparator<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public ByteArrayComparable 
getComparator() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    return comparator;<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 filterRowKey(Cell cell) 
throws IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    return false;<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>  protected boolean compareRow(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      final Cell cell) {<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      return true;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    int compareResult = 
CellComparator.compareRow(cell, comparator);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    return compare(compareOp, 
compareResult);<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>  protected boolean compareFamily(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      final Cell cell) {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      return true;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    int compareResult = 
CellComparator.compareFamily(cell, comparator);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return compare(compareOp, 
compareResult);<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>  protected boolean 
compareQualifier(final CompareOp compareOp,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      final ByteArrayComparable 
comparator, final Cell cell) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      return true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    int compareResult = 
CellComparator.compareQualifier(cell, comparator);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    return compare(compareOp, 
compareResult);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  protected boolean compareValue(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      final Cell cell) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      return true;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    int compareResult = 
CellComparator.compareValue(cell, comparator);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    return compare(compareOp, 
compareResult);<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>  private boolean compare(final CompareOp 
compareOp, int compareResult) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    switch (compareOp) {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    case LESS:<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      return compareResult &lt;= 0;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    case LESS_OR_EQUAL:<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      return compareResult &lt; 0;<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    case EQUAL:<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      return compareResult != 0;<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    case NOT_EQUAL:<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return compareResult == 0;<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>    case GREATER_OR_EQUAL:<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>      return compareResult &gt; 0;<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>    case GREATER:<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return compareResult &gt;= 0;<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    default:<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      throw new RuntimeException("Unknown 
Compare op " + compareOp.name());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  // returns an array of heterogeneous 
objects<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  public static ArrayList&lt;Object&gt; 
extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    
Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.163"></a>
-<span class="sourceLineNo">164</span>                                "Expected 
2 but got: %s", filterArguments.size());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    CompareOp compareOp = 
ParseFilter.createCompareOp(filterArguments.get(0));<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        comparator instanceof 
SubstringComparator) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      if (compareOp != CompareOp.EQUAL 
&amp;&amp;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>          compareOp != 
CompareOp.NOT_EQUAL) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator" 
+<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                                          
  " can only be used with EQUAL and NOT_EQUAL");<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>    ArrayList&lt;Object&gt; arguments = 
new ArrayList&lt;&gt;(2);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    arguments.add(compareOp);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>    arguments.add(comparator);<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    return arguments;<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * @return A pb instance to represent 
this instance.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  FilterProtos.CompareFilter convert() 
{<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    FilterProtos.CompareFilter.Builder 
builder =<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      
FilterProtos.CompareFilter.newBuilder();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.compareOp.name());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    builder.setCompareOp(compareOp);<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    if (this.comparator != null) 
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    return builder.build();<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   *<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param o<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    if (o == this) return true;<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    if (!(o instanceof CompareFilter)) 
return false;<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    CompareFilter other = 
(CompareFilter)o;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    return 
this.getOperator().equals(other.getOperator()) &amp;&amp;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      (this.getComparator() == 
other.getComparator()<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        || 
this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  @Override<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  public String toString() {<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    return String.format("%s (%s, %s)",<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>        
this.getClass().getSimpleName(),<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        this.compareOp.name(),<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>        
Bytes.toStringBinary(this.comparator.getValue()));<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">027</span>import 
org.apache.hadoop.hbase.CompareOperator;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<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.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * This is a generic filter to be used to 
filter by comparison.  It takes an<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * operator (equal, greater, not equal, 
etc) and a byte [] comparator.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;p&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * To filter by row key, use {@link 
RowFilter}.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * To filter by column qualifier, use 
{@link QualifierFilter}.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * To filter by value, use {@link 
SingleColumnValueFilter}.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * These filters can be wrapped with 
{@link SkipFilter} and {@link WhileMatchFilter}<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * to add more control.<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Multiple filters can be combined using 
{@link FilterList}.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@InterfaceAudience.Public<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>public abstract class CompareFilter 
extends FilterBase {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * Comparison operators. For filters 
only!<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * Use {@link CompareOperator} 
otherwise.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * It (intentionally) has at least the 
below enums with same names.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * TODO: Replace with generic {@link 
CompareOperator}<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @InterfaceAudience.Public<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>  public enum CompareOp {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>    /** less than */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    LESS,<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    /** less than or equal to */<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    LESS_OR_EQUAL,<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    /** equals */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    EQUAL,<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    /** not equal */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    NOT_EQUAL,<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    /** greater than or equal to */<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    GREATER_OR_EQUAL,<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    /** greater than */<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    GREATER,<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    /** no operation */<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>    NO_OP,<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>  protected CompareOp compareOp;<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected ByteArrayComparable 
comparator;<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>   * Constructor.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * @param compareOp the compare op for 
row matching<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param comparator the comparator for 
row matching<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public CompareFilter(final CompareOp 
compareOp,<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      final ByteArrayComparable 
comparator) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    this.compareOp = compareOp;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    this.comparator = comparator;<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>  /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @return operator<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public CompareOp getOperator() {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    return compareOp;<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 comparator<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  public ByteArrayComparable 
getComparator() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return comparator;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public boolean filterRowKey(Cell cell) 
throws IOException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<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><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  protected boolean compareRow(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      final Cell cell) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>      return true;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    int compareResult = 
CellComparator.compareRow(cell, comparator);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return compare(compareOp, 
compareResult);<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>  protected boolean compareFamily(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      final Cell cell) {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>      return true;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    int compareResult = 
CellComparator.compareFamily(cell, comparator);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return compare(compareOp, 
compareResult);<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>  protected boolean 
compareQualifier(final CompareOp compareOp,<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      final ByteArrayComparable 
comparator, final Cell cell) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      return true;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    int compareResult = 
CellComparator.compareQualifier(cell, comparator);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    return compare(compareOp, 
compareResult);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  protected boolean compareValue(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      final Cell cell) {<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      return true;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int compareResult = 
CellComparator.compareValue(cell, comparator);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    return compare(compareOp, 
compareResult);<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>  private boolean compare(final CompareOp 
compareOp, int compareResult) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    switch (compareOp) {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    case LESS:<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return compareResult &lt;= 0;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>    case LESS_OR_EQUAL:<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>      return compareResult &lt; 0;<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    case EQUAL:<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      return compareResult != 0;<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    case NOT_EQUAL:<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return compareResult == 0;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    case GREATER_OR_EQUAL:<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>      return compareResult &gt; 0;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    case GREATER:<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      return compareResult &gt;= 0;<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    default:<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      throw new RuntimeException("Unknown 
Compare op " + compareOp.name());<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><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  // returns an array of heterogeneous 
objects<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  public static ArrayList&lt;Object&gt; 
extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>    
Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.168"></a>
+<span class="sourceLineNo">169</span>                                "Expected 
2 but got: %s", filterArguments.size());<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    CompareOp compareOp = 
ParseFilter.createCompareOp(filterArguments.get(0));<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        comparator instanceof 
SubstringComparator) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      if (compareOp != CompareOp.EQUAL 
&amp;&amp;<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          compareOp != 
CompareOp.NOT_EQUAL) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator" 
+<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                                          
  " can only be used with EQUAL and NOT_EQUAL");<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>    ArrayList&lt;Object&gt; arguments = 
new ArrayList&lt;&gt;(2);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    arguments.add(compareOp);<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>    arguments.add(comparator);<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    return arguments;<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @return A pb instance to represent 
this instance.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  FilterProtos.CompareFilter convert() 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    FilterProtos.CompareFilter.Builder 
builder =<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      
FilterProtos.CompareFilter.newBuilder();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.compareOp.name());<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    builder.setCompareOp(compareOp);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (this.comparator != null) 
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    return builder.build();<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   *<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * @param o<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    if (o == this) return true;<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    if (!(o instanceof CompareFilter)) 
return false;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>    CompareFilter other = 
(CompareFilter)o;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    return 
this.getOperator().equals(other.getOperator()) &amp;&amp;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      (this.getComparator() == 
other.getComparator()<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        || 
this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>  @Override<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  public String toString() {<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>    return String.format("%s (%s, %s)",<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>        
this.getClass().getSimpleName(),<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        this.compareOp.name(),<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>        
Bytes.toStringBinary(this.comparator.getValue()));<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>}<a name="line.223"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
index 97df5d5..4f8ff6b 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
@@ -32,198 +32,203 @@
 <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.CellComparator;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * This is a generic filter to be used to 
filter by comparison.  It takes an<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * operator (equal, greater, not equal, 
etc) and a byte [] comparator.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * To filter by row key, use {@link 
RowFilter}.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;p&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * To filter by column qualifier, use 
{@link QualifierFilter}.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;p&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * To filter by value, use {@link 
SingleColumnValueFilter}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * &lt;p&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * These filters can be wrapped with 
{@link SkipFilter} and {@link WhileMatchFilter}<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * to add more control.<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;p&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Multiple filters can be combined using 
{@link FilterList}.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@InterfaceAudience.Public<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>public abstract class CompareFilter 
extends FilterBase {<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  /** Comparison operators. */<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>  @InterfaceAudience.Public<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  public enum CompareOp {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    /** less than */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    LESS,<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    /** less than or equal to */<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    LESS_OR_EQUAL,<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    /** equals */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    EQUAL,<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    /** not equal */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    NOT_EQUAL,<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    /** greater than or equal to */<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>    GREATER_OR_EQUAL,<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    /** greater than */<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    GREATER,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    /** no operation */<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    NO_OP,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  protected CompareOp compareOp;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  protected ByteArrayComparable 
comparator;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * Constructor.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * @param compareOp the compare op for 
row matching<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * @param comparator the comparator for 
row matching<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public CompareFilter(final CompareOp 
compareOp,<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      final ByteArrayComparable 
comparator) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    this.compareOp = compareOp;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    this.comparator = comparator;<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>  /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @return operator<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public CompareOp getOperator() {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    return compareOp;<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * @return the comparator<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public ByteArrayComparable 
getComparator() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    return comparator;<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 filterRowKey(Cell cell) 
throws IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    return false;<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>  protected boolean compareRow(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      final Cell cell) {<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      return true;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    int compareResult = 
CellComparator.compareRow(cell, comparator);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    return compare(compareOp, 
compareResult);<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>  protected boolean compareFamily(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      final Cell cell) {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      return true;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    int compareResult = 
CellComparator.compareFamily(cell, comparator);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return compare(compareOp, 
compareResult);<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>  protected boolean 
compareQualifier(final CompareOp compareOp,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      final ByteArrayComparable 
comparator, final Cell cell) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      return true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    int compareResult = 
CellComparator.compareQualifier(cell, comparator);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    return compare(compareOp, 
compareResult);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  protected boolean compareValue(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      final Cell cell) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      return true;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    int compareResult = 
CellComparator.compareValue(cell, comparator);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    return compare(compareOp, 
compareResult);<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>  private boolean compare(final CompareOp 
compareOp, int compareResult) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    switch (compareOp) {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    case LESS:<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      return compareResult &lt;= 0;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    case LESS_OR_EQUAL:<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      return compareResult &lt; 0;<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    case EQUAL:<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      return compareResult != 0;<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    case NOT_EQUAL:<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return compareResult == 0;<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>    case GREATER_OR_EQUAL:<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>      return compareResult &gt; 0;<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>    case GREATER:<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return compareResult &gt;= 0;<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    default:<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      throw new RuntimeException("Unknown 
Compare op " + compareOp.name());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  // returns an array of heterogeneous 
objects<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  public static ArrayList&lt;Object&gt; 
extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    
Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.163"></a>
-<span class="sourceLineNo">164</span>                                "Expected 
2 but got: %s", filterArguments.size());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    CompareOp compareOp = 
ParseFilter.createCompareOp(filterArguments.get(0));<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        comparator instanceof 
SubstringComparator) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      if (compareOp != CompareOp.EQUAL 
&amp;&amp;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>          compareOp != 
CompareOp.NOT_EQUAL) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator" 
+<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                                          
  " can only be used with EQUAL and NOT_EQUAL");<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>    ArrayList&lt;Object&gt; arguments = 
new ArrayList&lt;&gt;(2);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    arguments.add(compareOp);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>    arguments.add(comparator);<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    return arguments;<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * @return A pb instance to represent 
this instance.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  FilterProtos.CompareFilter convert() 
{<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    FilterProtos.CompareFilter.Builder 
builder =<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      
FilterProtos.CompareFilter.newBuilder();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.compareOp.name());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    builder.setCompareOp(compareOp);<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    if (this.comparator != null) 
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    return builder.build();<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   *<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param o<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    if (o == this) return true;<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    if (!(o instanceof CompareFilter)) 
return false;<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    CompareFilter other = 
(CompareFilter)o;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    return 
this.getOperator().equals(other.getOperator()) &amp;&amp;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      (this.getComparator() == 
other.getComparator()<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        || 
this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  @Override<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  public String toString() {<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    return String.format("%s (%s, %s)",<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>        
this.getClass().getSimpleName(),<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        this.compareOp.name(),<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>        
Bytes.toStringBinary(this.comparator.getValue()));<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">027</span>import 
org.apache.hadoop.hbase.CompareOperator;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<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.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * This is a generic filter to be used to 
filter by comparison.  It takes an<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * operator (equal, greater, not equal, 
etc) and a byte [] comparator.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;p&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * To filter by row key, use {@link 
RowFilter}.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * To filter by column qualifier, use 
{@link QualifierFilter}.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * To filter by value, use {@link 
SingleColumnValueFilter}.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * These filters can be wrapped with 
{@link SkipFilter} and {@link WhileMatchFilter}<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * to add more control.<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Multiple filters can be combined using 
{@link FilterList}.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@InterfaceAudience.Public<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>public abstract class CompareFilter 
extends FilterBase {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * Comparison operators. For filters 
only!<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * Use {@link CompareOperator} 
otherwise.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * It (intentionally) has at least the 
below enums with same names.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * TODO: Replace with generic {@link 
CompareOperator}<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @InterfaceAudience.Public<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>  public enum CompareOp {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>    /** less than */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    LESS,<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    /** less than or equal to */<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    LESS_OR_EQUAL,<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    /** equals */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    EQUAL,<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    /** not equal */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    NOT_EQUAL,<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    /** greater than or equal to */<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    GREATER_OR_EQUAL,<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    /** greater than */<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    GREATER,<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    /** no operation */<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>    NO_OP,<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>  protected CompareOp compareOp;<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected ByteArrayComparable 
comparator;<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>   * Constructor.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * @param compareOp the compare op for 
row matching<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param comparator the comparator for 
row matching<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public CompareFilter(final CompareOp 
compareOp,<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      final ByteArrayComparable 
comparator) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    this.compareOp = compareOp;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    this.comparator = comparator;<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>  /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @return operator<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public CompareOp getOperator() {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    return compareOp;<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 comparator<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  public ByteArrayComparable 
getComparator() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return comparator;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public boolean filterRowKey(Cell cell) 
throws IOException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<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><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  protected boolean compareRow(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      final Cell cell) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>      return true;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    int compareResult = 
CellComparator.compareRow(cell, comparator);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return compare(compareOp, 
compareResult);<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>  protected boolean compareFamily(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      final Cell cell) {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>      return true;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    int compareResult = 
CellComparator.compareFamily(cell, comparator);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return compare(compareOp, 
compareResult);<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>  protected boolean 
compareQualifier(final CompareOp compareOp,<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      final ByteArrayComparable 
comparator, final Cell cell) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      return true;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    int compareResult = 
CellComparator.compareQualifier(cell, comparator);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    return compare(compareOp, 
compareResult);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  protected boolean compareValue(final 
CompareOp compareOp, final ByteArrayComparable comparator,<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      final Cell cell) {<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (compareOp == CompareOp.NO_OP) {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      return true;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int compareResult = 
CellComparator.compareValue(cell, comparator);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    return compare(compareOp, 
compareResult);<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>  private boolean compare(final CompareOp 
compareOp, int compareResult) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    switch (compareOp) {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    case LESS:<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return compareResult &lt;= 0;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>    case LESS_OR_EQUAL:<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>      return compareResult &lt; 0;<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    case EQUAL:<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      return compareResult != 0;<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    case NOT_EQUAL:<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return compareResult == 0;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    case GREATER_OR_EQUAL:<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>      return compareResult &gt; 0;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    case GREATER:<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      return compareResult &gt;= 0;<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    default:<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      throw new RuntimeException("Unknown 
Compare op " + compareOp.name());<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><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  // returns an array of heterogeneous 
objects<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  public static ArrayList&lt;Object&gt; 
extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>    
Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.168"></a>
+<span class="sourceLineNo">169</span>                                "Expected 
2 but got: %s", filterArguments.size());<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    CompareOp compareOp = 
ParseFilter.createCompareOp(filterArguments.get(0));<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        comparator instanceof 
SubstringComparator) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      if (compareOp != CompareOp.EQUAL 
&amp;&amp;<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          compareOp != 
CompareOp.NOT_EQUAL) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator" 
+<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                                          
  " can only be used with EQUAL and NOT_EQUAL");<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>    ArrayList&lt;Object&gt; arguments = 
new ArrayList&lt;&gt;(2);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    arguments.add(compareOp);<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>    arguments.add(comparator);<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    return arguments;<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @return A pb instance to represent 
this instance.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  FilterProtos.CompareFilter convert() 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    FilterProtos.CompareFilter.Builder 
builder =<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      
FilterProtos.CompareFilter.newBuilder();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.compareOp.name());<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    builder.setCompareOp(compareOp);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (this.comparator != null) 
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    return builder.build();<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   *<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * @param o<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    if (o == this) return true;<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    if (!(o instanceof CompareFilter)) 
return false;<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>    CompareFilter other = 
(CompareFilter)o;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    return 
this.getOperator().equals(other.getOperator()) &amp;&amp;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      (this.getComparator() == 
other.getComparator()<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        || 
this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>  @Override<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  public String toString() {<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>    return String.format("%s (%s, %s)",<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>        
this.getClass().getSimpleName(),<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        this.compareOp.name(),<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>        
Bytes.toStringBinary(this.comparator.getValue()));<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>}<a name="line.223"></a>
 
 
 

Reply via email to