hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [29/51] [partial] hbase-site git commit: Published site at .
Date Sat, 09 Sep 2017 15:14:21 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1490b3ab/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
index 4b374ee..635b0b4 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span><a name="line.28"></a>
 <span class="sourceLineNo">029</span>/** Base class for byte array comparators */<a name="line.29"></a>
 <span class="sourceLineNo">030</span>@InterfaceAudience.Public<a name="line.30"></a>
-<span class="sourceLineNo">031</span>// TODO Now we are deviating a lot from the actual Comparable&lt;byte[]&gt; what this implements, by<a name="line.31"></a>
+<span class="sourceLineNo">031</span>// TODO Now we are deviating a lot from the actual Comparable&lt;byte[]&gt; that this implements, by<a name="line.31"></a>
 <span class="sourceLineNo">032</span>// adding special compareTo methods. We have to clean it. Deprecate this class and replace it<a name="line.32"></a>
 <span class="sourceLineNo">033</span>// with a more generic one which says it compares bytes (not necessary a byte array only)<a name="line.33"></a>
 <span class="sourceLineNo">034</span>// BytesComparable implements Comparable&lt;Byte&gt; will work?<a name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1490b3ab/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 4f8ff6b..0a5e976 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
@@ -62,173 +62,269 @@
 <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">057</span>   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link CompareOperator} instead.<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">059</span>  @Deprecated<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @InterfaceAudience.Public<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public enum CompareOp {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    /** less than */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    LESS,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    /** less than or equal to */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    LESS_OR_EQUAL,<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    /** equals */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    EQUAL,<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    /** not equal */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    NOT_EQUAL,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    /** greater than or equal to */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    GREATER_OR_EQUAL,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    /** greater than */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    GREATER,<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    /** no operation */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    NO_OP,<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected CompareOperator op;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  protected ByteArrayComparable comparator;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * Constructor.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param compareOp the compare op for row matching<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @param comparator the comparator for row matching<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use other constructor.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @Deprecated<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public CompareFilter(final CompareOp compareOp,<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      final ByteArrayComparable comparator) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    this(CompareOperator.valueOf(compareOp.name()), comparator);<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>   * Constructor.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param op the compare op for row matching<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * @param comparator the comparator for row matching<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public CompareFilter(final CompareOperator op,<a name="line.98"></a>
+<span class="sourceLineNo">099</span>                       final ByteArrayComparable comparator) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    this.op = op;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    this.comparator = comparator;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @return operator<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link #getCompareOperator()} instead.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Deprecated<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public CompareOp getOperator() {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    return CompareOp.valueOf(op.name());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public CompareOperator getCompareOperator() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    return op;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * @return the comparator<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public ByteArrayComparable getComparator() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return comparator;<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>  @Override<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public boolean filterRowKey(Cell cell) throws IOException {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return false;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * Use {@link #compareRow(CompareOperator, ByteArrayComparable, Cell)}<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  @Deprecated<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  protected boolean compareRow(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      final Cell cell) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    int compareResult = CellComparator.compareRow(cell, comparator);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    return compare(compareOp, compareResult);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  protected boolean compareRow(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.144"></a>
+<span class="sourceLineNo">145</span>                               final Cell cell) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    if (op == CompareOperator.NO_OP) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      return true;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    int compareResult = CellComparator.compareRow(cell, comparator);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return compare(op, compareResult);<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>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Use {@link #compareFamily(CompareOperator, ByteArrayComparable, Cell)}<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Deprecated<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  protected boolean compareFamily(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      final Cell cell) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    int compareResult = CellComparator.compareFamily(cell, comparator);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return compare(compareOp, compareResult);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  protected boolean compareFamily(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.167"></a>
+<span class="sourceLineNo">168</span>                                  final Cell cell) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    if (op == CompareOperator.NO_OP) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      return true;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    int compareResult = CellComparator.compareFamily(cell, comparator);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    return compare(op, compareResult);<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>
+<span class="sourceLineNo">176</span>  /**<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * Use {@link #compareQualifier(CompareOperator, ByteArrayComparable, Cell)}<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  @Deprecated<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  protected boolean compareQualifier(final CompareOp compareOp,<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      final ByteArrayComparable comparator, final Cell cell) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      return true;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    int compareResult = CellComparator.compareQualifier(cell, comparator);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    return compare(compareOp, compareResult);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>  protected boolean compareQualifier(final CompareOperator op,<a name="line.191"></a>
+<span class="sourceLineNo">192</span>                                     final ByteArrayComparable comparator, final Cell cell) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (op == CompareOperator.NO_OP) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return true;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    int compareResult = CellComparator.compareQualifier(cell, comparator);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    return compare(op, compareResult);<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>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * Use {@link #compareValue(CompareOperator, ByteArrayComparable, Cell)}<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Deprecated<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  protected boolean compareValue(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      final Cell cell) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      return true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    int compareResult = CellComparator.compareValue(cell, comparator);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    return compare(compareOp, compareResult);<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>
+<span class="sourceLineNo">216</span>  protected boolean compareValue(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                                 final Cell cell) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    if (op == CompareOperator.NO_OP) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      return true;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    int compareResult = CellComparator.compareValue(cell, comparator);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    return compare(op, compareResult);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  static boolean compare(final CompareOp op, int compareResult) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    switch (op) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    case LESS:<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      return compareResult &lt;= 0;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    case LESS_OR_EQUAL:<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      return compareResult &lt; 0;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    case EQUAL:<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      return compareResult != 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    case NOT_EQUAL:<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      return compareResult == 0;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    case GREATER_OR_EQUAL:<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      return compareResult &gt; 0;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    case GREATER:<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      return compareResult &gt;= 0;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    default:<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      throw new RuntimeException("Unknown Compare op " + op.name());<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>  static boolean compare(final CompareOperator op, int compareResult) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    switch (op) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      case LESS:<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        return compareResult &lt;= 0;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      case LESS_OR_EQUAL:<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        return compareResult &lt; 0;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      case EQUAL:<a name="line.250"></a>
+<span class="sourceLineNo">251</span>        return compareResult != 0;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      case NOT_EQUAL:<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        return compareResult == 0;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      case GREATER_OR_EQUAL:<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        return compareResult &gt; 0;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      case GREATER:<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        return compareResult &gt;= 0;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      default:<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        throw new RuntimeException("Unknown Compare op " + op.name());<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  // returns an array of heterogeneous objects<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public static ArrayList&lt;Object&gt; extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>                                "Expected 2 but got: %s", filterArguments.size());<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    CompareOperator op = ParseFilter.createCompareOperator(filterArguments.get(0));<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    if (comparator instanceof RegexStringComparator ||<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        comparator instanceof SubstringComparator) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (op != CompareOperator.EQUAL &amp;&amp;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>          op != CompareOperator.NOT_EQUAL) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        throw new IllegalArgumentException ("A regexstring comparator and substring comparator" +<a name="line.275"></a>
+<span class="sourceLineNo">276</span>                                            " can only be used with EQUAL and NOT_EQUAL");<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    ArrayList&lt;Object&gt; arguments = new ArrayList&lt;&gt;(2);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    arguments.add(op);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    arguments.add(comparator);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    return arguments;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>  /**<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @return A pb instance to represent this instance.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   */<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  FilterProtos.CompareFilter convert() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    FilterProtos.CompareFilter.Builder builder =<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      FilterProtos.CompareFilter.newBuilder();<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    HBaseProtos.CompareType compareOp = CompareType.valueOf(this.op.name());<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    builder.setCompareOp(compareOp);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    if (this.comparator != null) builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    return builder.build();<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>  /**<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   *<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   * @param o<a name="line.299"></a>
+<span class="sourceLineNo">300</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.300"></a>
+<span class="sourceLineNo">301</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (o == this) return true;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    if (!(o instanceof CompareFilter)) return false;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    CompareFilter other = (CompareFilter)o;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    return this.getCompareOperator().equals(other.getCompareOperator()) &amp;&amp;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      (this.getComparator() == other.getComparator()<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        || this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a name="line.309"></a>
+<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>  @Override<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  public String toString() {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    return String.format("%s (%s, %s)",<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        this.getClass().getSimpleName(),<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        this.op.name(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        Bytes.toStringBinary(this.comparator.getValue()));<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  }<a name="line.318"></a>
+<span class="sourceLineNo">319</span>}<a name="line.319"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1490b3ab/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 4f8ff6b..0a5e976 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
@@ -62,173 +62,269 @@
 <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">057</span>   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link CompareOperator} instead.<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">059</span>  @Deprecated<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @InterfaceAudience.Public<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public enum CompareOp {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    /** less than */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    LESS,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    /** less than or equal to */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    LESS_OR_EQUAL,<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    /** equals */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    EQUAL,<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    /** not equal */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    NOT_EQUAL,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    /** greater than or equal to */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    GREATER_OR_EQUAL,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    /** greater than */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    GREATER,<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    /** no operation */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    NO_OP,<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected CompareOperator op;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  protected ByteArrayComparable comparator;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * Constructor.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param compareOp the compare op for row matching<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @param comparator the comparator for row matching<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use other constructor.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @Deprecated<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public CompareFilter(final CompareOp compareOp,<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      final ByteArrayComparable comparator) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    this(CompareOperator.valueOf(compareOp.name()), comparator);<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>   * Constructor.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param op the compare op for row matching<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * @param comparator the comparator for row matching<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public CompareFilter(final CompareOperator op,<a name="line.98"></a>
+<span class="sourceLineNo">099</span>                       final ByteArrayComparable comparator) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    this.op = op;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    this.comparator = comparator;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @return operator<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link #getCompareOperator()} instead.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Deprecated<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public CompareOp getOperator() {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    return CompareOp.valueOf(op.name());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public CompareOperator getCompareOperator() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    return op;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * @return the comparator<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public ByteArrayComparable getComparator() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return comparator;<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>  @Override<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public boolean filterRowKey(Cell cell) throws IOException {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return false;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * Use {@link #compareRow(CompareOperator, ByteArrayComparable, Cell)}<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  @Deprecated<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  protected boolean compareRow(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      final Cell cell) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    int compareResult = CellComparator.compareRow(cell, comparator);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    return compare(compareOp, compareResult);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  protected boolean compareRow(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.144"></a>
+<span class="sourceLineNo">145</span>                               final Cell cell) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    if (op == CompareOperator.NO_OP) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      return true;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    int compareResult = CellComparator.compareRow(cell, comparator);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return compare(op, compareResult);<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>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Use {@link #compareFamily(CompareOperator, ByteArrayComparable, Cell)}<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Deprecated<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  protected boolean compareFamily(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      final Cell cell) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    int compareResult = CellComparator.compareFamily(cell, comparator);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return compare(compareOp, compareResult);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  protected boolean compareFamily(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.167"></a>
+<span class="sourceLineNo">168</span>                                  final Cell cell) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    if (op == CompareOperator.NO_OP) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      return true;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    int compareResult = CellComparator.compareFamily(cell, comparator);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    return compare(op, compareResult);<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>
+<span class="sourceLineNo">176</span>  /**<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * Use {@link #compareQualifier(CompareOperator, ByteArrayComparable, Cell)}<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  @Deprecated<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  protected boolean compareQualifier(final CompareOp compareOp,<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      final ByteArrayComparable comparator, final Cell cell) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      return true;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    int compareResult = CellComparator.compareQualifier(cell, comparator);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    return compare(compareOp, compareResult);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>  protected boolean compareQualifier(final CompareOperator op,<a name="line.191"></a>
+<span class="sourceLineNo">192</span>                                     final ByteArrayComparable comparator, final Cell cell) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (op == CompareOperator.NO_OP) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return true;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    int compareResult = CellComparator.compareQualifier(cell, comparator);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    return compare(op, compareResult);<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>   * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * Use {@link #compareValue(CompareOperator, ByteArrayComparable, Cell)}<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Deprecated<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  protected boolean compareValue(final CompareOp compareOp, final ByteArrayComparable comparator,<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      final Cell cell) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    // We do not call through to the non-deprecated method for perf reasons.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    if (compareOp == CompareOp.NO_OP) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      return true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    int compareResult = CellComparator.compareValue(cell, comparator);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    return compare(compareOp, compareResult);<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>
+<span class="sourceLineNo">216</span>  protected boolean compareValue(final CompareOperator op, final ByteArrayComparable comparator,<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                                 final Cell cell) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    if (op == CompareOperator.NO_OP) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      return true;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    int compareResult = CellComparator.compareValue(cell, comparator);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    return compare(op, compareResult);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  static boolean compare(final CompareOp op, int compareResult) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    switch (op) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    case LESS:<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      return compareResult &lt;= 0;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    case LESS_OR_EQUAL:<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      return compareResult &lt; 0;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    case EQUAL:<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      return compareResult != 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    case NOT_EQUAL:<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      return compareResult == 0;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    case GREATER_OR_EQUAL:<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      return compareResult &gt; 0;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    case GREATER:<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      return compareResult &gt;= 0;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    default:<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      throw new RuntimeException("Unknown Compare op " + op.name());<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>  static boolean compare(final CompareOperator op, int compareResult) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    switch (op) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      case LESS:<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        return compareResult &lt;= 0;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      case LESS_OR_EQUAL:<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        return compareResult &lt; 0;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      case EQUAL:<a name="line.250"></a>
+<span class="sourceLineNo">251</span>        return compareResult != 0;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      case NOT_EQUAL:<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        return compareResult == 0;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      case GREATER_OR_EQUAL:<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        return compareResult &gt; 0;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      case GREATER:<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        return compareResult &gt;= 0;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      default:<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        throw new RuntimeException("Unknown Compare op " + op.name());<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  // returns an array of heterogeneous objects<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public static ArrayList&lt;Object&gt; extractArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    Preconditions.checkArgument(filterArguments.size() == 2,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>                                "Expected 2 but got: %s", filterArguments.size());<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    CompareOperator op = ParseFilter.createCompareOperator(filterArguments.get(0));<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      ParseFilter.removeQuotesFromByteArray(filterArguments.get(1)));<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    if (comparator instanceof RegexStringComparator ||<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        comparator instanceof SubstringComparator) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (op != CompareOperator.EQUAL &amp;&amp;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>          op != CompareOperator.NOT_EQUAL) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        throw new IllegalArgumentException ("A regexstring comparator and substring comparator" +<a name="line.275"></a>
+<span class="sourceLineNo">276</span>                                            " can only be used with EQUAL and NOT_EQUAL");<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    ArrayList&lt;Object&gt; arguments = new ArrayList&lt;&gt;(2);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    arguments.add(op);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    arguments.add(comparator);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    return arguments;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>  /**<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @return A pb instance to represent this instance.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   */<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  FilterProtos.CompareFilter convert() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    FilterProtos.CompareFilter.Builder builder =<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      FilterProtos.CompareFilter.newBuilder();<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    HBaseProtos.CompareType compareOp = CompareType.valueOf(this.op.name());<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    builder.setCompareOp(compareOp);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    if (this.comparator != null) builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    return builder.build();<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>  /**<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   *<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   * @param o<a name="line.299"></a>
+<span class="sourceLineNo">300</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.300"></a>
+<span class="sourceLineNo">301</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (o == this) return true;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    if (!(o instanceof CompareFilter)) return false;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    CompareFilter other = (CompareFilter)o;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    return this.getCompareOperator().equals(other.getCompareOperator()) &amp;&amp;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      (this.getComparator() == other.getComparator()<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        || this.getComparator().areSerializedFieldsEqual(other.getComparator()));<a name="line.309"></a>
+<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>  @Override<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  public String toString() {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    return String.format("%s (%s, %s)",<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        this.getClass().getSimpleName(),<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        this.op.name(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        Bytes.toStringBinary(this.comparator.getValue()));<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  }<a name="line.318"></a>
+<span class="sourceLineNo">319</span>}<a name="line.319"></a>
 
 
 


Mime
View raw message