http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
index a38cce6..bf21363 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/RowFilter.html
@@ -84,83 +84,89 @@
 <span class="sourceLineNo">076</span>    this.filterOutRow = false;<a 
name="line.76"></a>
 <span class="sourceLineNo">077</span>  }<a name="line.77"></a>
 <span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public ReturnCode filterKeyValue(Cell 
v) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    if(this.filterOutRow) {<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>      return ReturnCode.NEXT_ROW;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    return ReturnCode.INCLUDE;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>  @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public boolean filterRowKey(Cell 
firstRowCell) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    if (compareRow(getCompareOperator(), 
this.comparator, firstRowCell)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      this.filterOutRow = true;<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    return this.filterOutRow;<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  @Override<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public boolean filterRow() {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    return this.filterOutRow;<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    @SuppressWarnings("rawtypes") // for 
arguments<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    ArrayList arguments = 
CompareFilter.extractArguments(filterArguments);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    CompareOperator compareOp = 
(CompareOperator)arguments.get(0);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    ByteArrayComparable comparator = 
(ByteArrayComparable)arguments.get(1);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    return new RowFilter(compareOp, 
comparator);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  * @return The filter serialized using 
pb<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  public byte [] toByteArray() {<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    FilterProtos.RowFilter.Builder 
builder =<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      
FilterProtos.RowFilter.newBuilder();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    
builder.setCompareFilter(super.convert());<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * @param pbBytes A pb serialized 
{@link RowFilter} instance<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * @return An instance of {@link 
RowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @throws DeserializationException<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @see #toByteArray<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  public static RowFilter parseFrom(final 
byte [] pbBytes)<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  throws DeserializationException {<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    FilterProtos.RowFilter proto;<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    try {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      proto = 
FilterProtos.RowFilter.parseFrom(pbBytes);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      throw new 
DeserializationException(e);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    final CompareOperator valueCompareOp 
=<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      
CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    ByteArrayComparable valueComparator = 
null;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      if 
(proto.getCompareFilter().hasComparator()) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        valueComparator = 
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    } catch (IOException ioe) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      throw new 
DeserializationException(ioe);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    return new 
RowFilter(valueCompareOp,valueComparator);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>  /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   */<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    if (o == this) return true;<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    if (!(o instanceof RowFilter)) return 
false;<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    return 
super.areSerializedFieldsEqual(o);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>}<a name="line.155"></a>
+<span class="sourceLineNo">079</span>  @Deprecated<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    return filterCell(c);<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  @Override<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public ReturnCode filterCell(final Cell 
v) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    if(this.filterOutRow) {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>      return ReturnCode.NEXT_ROW;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    return ReturnCode.INCLUDE;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public boolean filterRowKey(Cell 
firstRowCell) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (compareRow(getCompareOperator(), 
this.comparator, firstRowCell)) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      this.filterOutRow = true;<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    return this.filterOutRow;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public boolean filterRow() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    return this.filterOutRow;<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    @SuppressWarnings("rawtypes") // for 
arguments<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    ArrayList arguments = 
CompareFilter.extractArguments(filterArguments);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    CompareOperator compareOp = 
(CompareOperator)arguments.get(0);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    ByteArrayComparable comparator = 
(ByteArrayComparable)arguments.get(1);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return new RowFilter(compareOp, 
comparator);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  * @return The filter serialized using 
pb<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public byte [] toByteArray() {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    FilterProtos.RowFilter.Builder 
builder =<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      
FilterProtos.RowFilter.newBuilder();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    
builder.setCompareFilter(super.convert());<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return 
builder.build().toByteArray();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   * @param pbBytes A pb serialized 
{@link RowFilter} instance<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @return An instance of {@link 
RowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @throws DeserializationException<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @see #toByteArray<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>   */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  public static RowFilter parseFrom(final 
byte [] pbBytes)<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  throws DeserializationException {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    FilterProtos.RowFilter proto;<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>    try {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      proto = 
FilterProtos.RowFilter.parseFrom(pbBytes);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      throw new 
DeserializationException(e);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    final CompareOperator valueCompareOp 
=<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      
CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    ByteArrayComparable valueComparator = 
null;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    try {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      if 
(proto.getCompareFilter().hasComparator()) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        valueComparator = 
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    } catch (IOException ioe) {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      throw new 
DeserializationException(ioe);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    return new 
RowFilter(valueCompareOp,valueComparator);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  /**<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    if (o == this) return true;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    if (!(o instanceof RowFilter)) return 
false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>    return 
super.areSerializedFieldsEqual(o);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>}<a name="line.161"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
index 3dcfdd7..25e4d7d 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
@@ -253,209 +253,215 @@
 <span class="sourceLineNo">245</span>    return false;<a name="line.245"></a>
 <span class="sourceLineNo">246</span>  }<a name="line.246"></a>
 <span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  @Override<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  public ReturnCode filterKeyValue(Cell 
c) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    // System.out.println("REMOVE KEY=" + 
keyValue.toString() + ", value=" + Bytes.toString(keyValue.getValue()));<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>    if (this.matchedColumn) {<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>      // We already found and matched the 
single column, all keys now pass<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      return ReturnCode.INCLUDE;<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>    } else if (this.latestVersionOnly 
&amp;&amp; this.foundColumn) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      // We found but did not match the 
single column, skip to next row<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return ReturnCode.NEXT_ROW;<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    if (!CellUtil.matchingColumn(c, 
this.columnFamily, this.columnQualifier)) {<a name="line.258"></a>
+<span class="sourceLineNo">248</span>  @Deprecated<a name="line.248"></a>
+<span class="sourceLineNo">249</span>  @Override<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    return filterCell(c);<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  @Override<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    // System.out.println("REMOVE KEY=" + 
keyValue.toString() + ", value=" + Bytes.toString(keyValue.getValue()));<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    if (this.matchedColumn) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>      // We already found and matched the 
single column, all keys now pass<a name="line.258"></a>
 <span class="sourceLineNo">259</span>      return ReturnCode.INCLUDE;<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    foundColumn = true;<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>    if (filterColumnValue(c)) {<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>      return this.latestVersionOnly? 
ReturnCode.NEXT_ROW: ReturnCode.INCLUDE;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    this.matchedColumn = true;<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>    return ReturnCode.INCLUDE;<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private boolean filterColumnValue(final 
Cell cell) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    int compareResult = 
CellUtil.compareValue(cell, this.comparator);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    return CompareFilter.compare(this.op, 
compareResult);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public boolean filterRow() {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    // If column was found, return false 
if it was matched, true if it was not<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    // If column not found, return true 
if we filter if missing, false if not<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    return this.foundColumn? 
!this.matchedColumn: this.filterIfMissing;<a name="line.277"></a>
+<span class="sourceLineNo">260</span>    } else if (this.latestVersionOnly 
&amp;&amp; this.foundColumn) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      // We found but did not match the 
single column, skip to next row<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      return ReturnCode.NEXT_ROW;<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    if (!CellUtil.matchingColumn(c, 
this.columnFamily, this.columnQualifier)) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      return ReturnCode.INCLUDE;<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    foundColumn = true;<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    if (filterColumnValue(c)) {<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>      return this.latestVersionOnly? 
ReturnCode.NEXT_ROW: ReturnCode.INCLUDE;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    this.matchedColumn = true;<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>    return ReturnCode.INCLUDE;<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  private boolean filterColumnValue(final 
Cell cell) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    int compareResult = 
CellUtil.compareValue(cell, this.comparator);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    return CompareFilter.compare(this.op, 
compareResult);<a name="line.277"></a>
 <span class="sourceLineNo">278</span>  }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  <a name="line.279"></a>
-<span class="sourceLineNo">280</span>  public boolean hasFilterRow() {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>    return true;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>  public void reset() {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    foundColumn = false;<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>    matchedColumn = false;<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>  }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>  /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * Get whether entire row should be 
filtered if column is not found.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   * @return true if row should be 
skipped if column not found, false if row<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   * should be let through anyways<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>   */<a name="line.293"></a>
-<span class="sourceLineNo">294</span>  public boolean getFilterIfMissing() {<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>    return filterIfMissing;<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>   * Set whether entire row should be 
filtered if column is not found.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>   * &lt;p&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * If true, the entire row will be 
skipped if the column is not found.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   * &lt;p&gt;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   * If false, the row will pass if the 
column is not found.  This is default.<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   * @param filterIfMissing flag<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span>   */<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public void setFilterIfMissing(boolean 
filterIfMissing) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    this.filterIfMissing = 
filterIfMissing;<a name="line.307"></a>
-<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>  /**<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   * Get whether only the latest version 
of the column value should be compared.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * If true, the row will be returned if 
only the latest version of the column<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   * value matches. If false, the row 
will be returned if any version of the<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   * column value matches. The default is 
true.<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   * @return return value<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>  public boolean getLatestVersionOnly() 
{<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    return latestVersionOnly;<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>  /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   * Set whether only the latest version 
of the column value should be compared.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * If true, the row will be returned if 
only the latest version of the column<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   * value matches. If false, the row 
will be returned if any version of the<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * column value matches. The default is 
true.<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @param latestVersionOnly flag<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>   */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  public void 
setLatestVersionOnly(boolean latestVersionOnly) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    this.latestVersionOnly = 
latestVersionOnly;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>    
Preconditions.checkArgument(filterArguments.size() == 4 || 
filterArguments.size() == 6,<a name="line.333"></a>
-<span class="sourceLineNo">334</span>                                "Expected 
4 or 6 but got: %s", filterArguments.size());<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    byte [] family = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    byte [] qualifier = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>    CompareOperator op = 
ParseFilter.createCompareOperator(filterArguments.get(2));<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>    
org.apache.hadoop.hbase.filter.ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(3)));<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        comparator instanceof 
SubstringComparator) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      if (op != CompareOperator.EQUAL 
&amp;&amp;<a name="line.343"></a>
-<span class="sourceLineNo">344</span>          op != 
CompareOperator.NOT_EQUAL) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator " 
+<a name="line.345"></a>
-<span class="sourceLineNo">346</span>                                          
  "can only be used with EQUAL and NOT_EQUAL");<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      }<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>    SingleColumnValueFilter filter = new 
SingleColumnValueFilter(family, qualifier,<a name="line.350"></a>
-<span class="sourceLineNo">351</span>                                          
                       op, comparator);<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>    if (filterArguments.size() == 6) {<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>      boolean filterIfMissing = 
ParseFilter.convertByteArrayToBoolean(filterArguments.get(4));<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>      boolean latestVersionOnly = 
ParseFilter.convertByteArrayToBoolean(filterArguments.get(5));<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>      
filter.setFilterIfMissing(filterIfMissing);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      
filter.setLatestVersionOnly(latestVersionOnly);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    }<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    return filter;<a name="line.359"></a>
-<span class="sourceLineNo">360</span>  }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span>  FilterProtos.SingleColumnValueFilter 
convert() {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    
FilterProtos.SingleColumnValueFilter.Builder builder =<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      
FilterProtos.SingleColumnValueFilter.newBuilder();<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (this.columnFamily != null) {<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>      
builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    if (this.columnQualifier != null) {<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>      
builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a
 name="line.369"></a>
-<span class="sourceLineNo">370</span>    }<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.op.name());<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    builder.setCompareOp(compareOp);<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>    
builder.setFilterIfMissing(this.filterIfMissing);<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    
builder.setLatestVersionOnly(this.latestVersionOnly);<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return builder.build();<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * @return The filter serialized using 
pb<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   */<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  public byte [] toByteArray() {<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>    return convert().toByteArray();<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>  /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param pbBytes A pb serialized 
{@link SingleColumnValueFilter} instance<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @return An instance of {@link 
SingleColumnValueFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>   * @throws 
org.apache.hadoop.hbase.exceptions.DeserializationException<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>   * @see #toByteArray<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
-<span class="sourceLineNo">393</span>  public static SingleColumnValueFilter 
parseFrom(final byte [] pbBytes)<a name="line.393"></a>
-<span class="sourceLineNo">394</span>  throws DeserializationException {<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>    FilterProtos.SingleColumnValueFilter 
proto;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    try {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      proto = 
FilterProtos.SingleColumnValueFilter.parseFrom(pbBytes);<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      throw new 
DeserializationException(e);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>    final CompareOperator compareOp =<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>      
CompareOperator.valueOf(proto.getCompareOp().name());<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    final 
org.apache.hadoop.hbase.filter.ByteArrayComparable comparator;<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>    try {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      comparator = 
ProtobufUtil.toComparator(proto.getComparator());<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    } catch (IOException ioe) {<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>      throw new 
DeserializationException(ioe);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span>    return new 
SingleColumnValueFilter(proto.hasColumnFamily() ? proto.getColumnFamily()<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>        .toByteArray() : null, 
proto.hasColumnQualifier() ? proto.getColumnQualifier()<a name="line.412"></a>
-<span class="sourceLineNo">413</span>        .toByteArray() : null, compareOp, 
comparator, proto.getFilterIfMissing(), proto<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        .getLatestVersionOnly());<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span>  }<a name="line.415"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>  public boolean filterRow() {<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>    // If column was found, return false 
if it was matched, true if it was not<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    // If column not found, return true 
if we filter if missing, false if not<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    return this.foundColumn? 
!this.matchedColumn: this.filterIfMissing;<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>  public boolean hasFilterRow() {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>    return true;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public void reset() {<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>    foundColumn = false;<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>    matchedColumn = false;<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>  /**<a name="line.295"></a>
+<span class="sourceLineNo">296</span>   * Get whether entire row should be 
filtered if column is not found.<a name="line.296"></a>
+<span class="sourceLineNo">297</span>   * @return true if row should be 
skipped if column not found, false if row<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   * should be let through anyways<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>   */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  public boolean getFilterIfMissing() {<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>    return filterIfMissing;<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>  }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>  /**<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   * Set whether entire row should be 
filtered if column is not found.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>   * &lt;p&gt;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   * If true, the entire row will be 
skipped if the column is not found.<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * &lt;p&gt;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   * If false, the row will pass if the 
column is not found.  This is default.<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * @param filterIfMissing flag<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public void setFilterIfMissing(boolean 
filterIfMissing) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    this.filterIfMissing = 
filterIfMissing;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>  /**<a name="line.316"></a>
+<span class="sourceLineNo">317</span>   * Get whether only the latest version 
of the column value should be compared.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * If true, the row will be returned if 
only the latest version of the column<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   * value matches. If false, the row 
will be returned if any version of the<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   * column value matches. The default is 
true.<a name="line.320"></a>
+<span class="sourceLineNo">321</span>   * @return return value<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>   */<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  public boolean getLatestVersionOnly() 
{<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    return latestVersionOnly;<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * Set whether only the latest version 
of the column value should be compared.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * If true, the row will be returned if 
only the latest version of the column<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * value matches. If false, the row 
will be returned if any version of the<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * column value matches. The default is 
true.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   * @param latestVersionOnly flag<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  public void 
setLatestVersionOnly(boolean latestVersionOnly) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    this.latestVersionOnly = 
latestVersionOnly;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>    
Preconditions.checkArgument(filterArguments.size() == 4 || 
filterArguments.size() == 6,<a name="line.339"></a>
+<span class="sourceLineNo">340</span>                                "Expected 
4 or 6 but got: %s", filterArguments.size());<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    byte [] family = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>    byte [] qualifier = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    CompareOperator op = 
ParseFilter.createCompareOperator(filterArguments.get(2));<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>    
org.apache.hadoop.hbase.filter.ByteArrayComparable comparator = 
ParseFilter.createComparator(<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      
ParseFilter.removeQuotesFromByteArray(filterArguments.get(3)));<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>    if (comparator instanceof 
RegexStringComparator ||<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        comparator instanceof 
SubstringComparator) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      if (op != CompareOperator.EQUAL 
&amp;&amp;<a name="line.349"></a>
+<span class="sourceLineNo">350</span>          op != 
CompareOperator.NOT_EQUAL) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        throw new 
IllegalArgumentException ("A regexstring comparator and substring comparator " 
+<a name="line.351"></a>
+<span class="sourceLineNo">352</span>                                          
  "can only be used with EQUAL and NOT_EQUAL");<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>    SingleColumnValueFilter filter = new 
SingleColumnValueFilter(family, qualifier,<a name="line.356"></a>
+<span class="sourceLineNo">357</span>                                          
                       op, comparator);<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>    if (filterArguments.size() == 6) {<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>      boolean filterIfMissing = 
ParseFilter.convertByteArrayToBoolean(filterArguments.get(4));<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>      boolean latestVersionOnly = 
ParseFilter.convertByteArrayToBoolean(filterArguments.get(5));<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>      
filter.setFilterIfMissing(filterIfMissing);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      
filter.setLatestVersionOnly(latestVersionOnly);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    return filter;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>  FilterProtos.SingleColumnValueFilter 
convert() {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    
FilterProtos.SingleColumnValueFilter.Builder builder =<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      
FilterProtos.SingleColumnValueFilter.newBuilder();<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    if (this.columnFamily != null) {<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>      
builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    if (this.columnQualifier != null) {<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>      
builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a
 name="line.375"></a>
+<span class="sourceLineNo">376</span>    }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    HBaseProtos.CompareType compareOp = 
CompareType.valueOf(this.op.name());<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    builder.setCompareOp(compareOp);<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>    
builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>    
builder.setFilterIfMissing(this.filterIfMissing);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    
builder.setLatestVersionOnly(this.latestVersionOnly);<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>    return builder.build();<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * @return The filter serialized using 
pb<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   */<a name="line.388"></a>
+<span class="sourceLineNo">389</span>  public byte [] toByteArray() {<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>    return convert().toByteArray();<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>  /**<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   * @param pbBytes A pb serialized 
{@link SingleColumnValueFilter} instance<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * @return An instance of {@link 
SingleColumnValueFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>   * @throws 
org.apache.hadoop.hbase.exceptions.DeserializationException<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>   * @see #toByteArray<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>   */<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public static SingleColumnValueFilter 
parseFrom(final byte [] pbBytes)<a name="line.399"></a>
+<span class="sourceLineNo">400</span>  throws DeserializationException {<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    FilterProtos.SingleColumnValueFilter 
proto;<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      proto = 
FilterProtos.SingleColumnValueFilter.parseFrom(pbBytes);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      throw new 
DeserializationException(e);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>    final CompareOperator compareOp =<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>      
CompareOperator.valueOf(proto.getCompareOp().name());<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    final 
org.apache.hadoop.hbase.filter.ByteArrayComparable comparator;<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>    try {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      comparator = 
ProtobufUtil.toComparator(proto.getComparator());<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    } catch (IOException ioe) {<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>      throw new 
DeserializationException(ioe);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    }<a name="line.415"></a>
 <span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>  /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.418"></a>
-<span class="sourceLineNo">419</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   */<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (o == this) return true;<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>    if (!(o instanceof 
SingleColumnValueFilter)) return false;<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>    SingleColumnValueFilter other = 
(SingleColumnValueFilter)o;<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    return Bytes.equals(this.getFamily(), 
other.getFamily())<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      &amp;&amp; 
Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      &amp;&amp; 
this.op.equals(other.op)<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      &amp;&amp; 
this.getComparator().areSerializedFieldsEqual(other.getComparator())<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>      &amp;&amp; 
this.getFilterIfMissing() == other.getFilterIfMissing()<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      &amp;&amp; 
this.getLatestVersionOnly() == other.getLatestVersionOnly();<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>  }<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span>  /**<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   * The only CF this filter needs is 
given column family. So, it's the only essential<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * column in whole scan. If 
filterIfMissing == false, all families are essential,<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * because of possibility of skipping 
the rows without any data in filtered CF.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   */<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  public boolean isFamilyEssential(byte[] 
name) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    return !this.filterIfMissing || 
Bytes.equals(name, this.columnFamily);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span>  @Override<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  public String toString() {<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>    return String.format("%s (%s, %s, %s, 
%s)",<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        this.getClass().getSimpleName(), 
Bytes.toStringBinary(this.columnFamily),<a name="line.446"></a>
-<span class="sourceLineNo">447</span>        
Bytes.toStringBinary(this.columnQualifier), this.op.name(),<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>        
Bytes.toStringBinary(this.comparator.getValue()));<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>}<a name="line.450"></a>
+<span class="sourceLineNo">417</span>    return new 
SingleColumnValueFilter(proto.hasColumnFamily() ? proto.getColumnFamily()<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>        .toByteArray() : null, 
proto.hasColumnQualifier() ? proto.getColumnQualifier()<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        .toByteArray() : null, compareOp, 
comparator, proto.getFilterIfMissing(), proto<a name="line.419"></a>
+<span class="sourceLineNo">420</span>        .getLatestVersionOnly());<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>  /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   */<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (o == this) return true;<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>    if (!(o instanceof 
SingleColumnValueFilter)) return false;<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>    SingleColumnValueFilter other = 
(SingleColumnValueFilter)o;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    return Bytes.equals(this.getFamily(), 
other.getFamily())<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      &amp;&amp; 
Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      &amp;&amp; 
this.op.equals(other.op)<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      &amp;&amp; 
this.getComparator().areSerializedFieldsEqual(other.getComparator())<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>      &amp;&amp; 
this.getFilterIfMissing() == other.getFilterIfMissing()<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      &amp;&amp; 
this.getLatestVersionOnly() == other.getLatestVersionOnly();<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>  /**<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * The only CF this filter needs is 
given column family. So, it's the only essential<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * column in whole scan. If 
filterIfMissing == false, all families are essential,<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * because of possibility of skipping 
the rows without any data in filtered CF.<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public boolean isFamilyEssential(byte[] 
name) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    return !this.filterIfMissing || 
Bytes.equals(name, this.columnFamily);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  @Override<a name="line.449"></a>
+<span class="sourceLineNo">450</span>  public String toString() {<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>    return String.format("%s (%s, %s, %s, 
%s)",<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        this.getClass().getSimpleName(), 
Bytes.toStringBinary(this.columnFamily),<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        
Bytes.toStringBinary(this.columnQualifier), this.op.name(),<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>        
Bytes.toStringBinary(this.comparator.getValue()));<a name="line.454"></a>
+<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>}<a name="line.456"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
index b92cac8..a214677 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
@@ -86,79 +86,85 @@
 <span class="sourceLineNo">078</span>    return false;<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>  @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public ReturnCode filterKeyValue(Cell 
v) throws IOException {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    ReturnCode c = 
filter.filterKeyValue(v);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    changeFR(c != ReturnCode.INCLUDE);<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    return c;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @Override<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public Cell transformCell(Cell v) 
throws IOException {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    return filter.transformCell(v);<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>  public boolean filterRow() {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    return filterRow;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    <a name="line.96"></a>
-<span class="sourceLineNo">097</span>  public boolean hasFilterRow() {<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>    return true;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @return The filter serialized using 
pb<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  public byte[] toByteArray() throws 
IOException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    FilterProtos.SkipFilter.Builder 
builder =<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      
FilterProtos.SkipFilter.newBuilder();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    
builder.setFilter(ProtobufUtil.toFilter(this.filter));<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @param pbBytes A pb serialized 
{@link SkipFilter} instance<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @return An instance of {@link 
SkipFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @throws DeserializationException<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @see #toByteArray<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  public static SkipFilter 
parseFrom(final byte [] pbBytes)<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  throws DeserializationException {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    FilterProtos.SkipFilter proto;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      proto = 
FilterProtos.SkipFilter.parseFrom(pbBytes);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      throw new 
DeserializationException(e);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    try {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      return new 
SkipFilter(ProtobufUtil.toFilter(proto.getFilter()));<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    } catch (IOException ioe) {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>      throw new 
DeserializationException(ioe);<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><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * @param other<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    if (o == this) return true;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (!(o instanceof SkipFilter)) 
return false;<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>    SkipFilter other = (SkipFilter)o;<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>    return 
getFilter().areSerializedFieldsEqual(other.getFilter());<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>  public boolean isFamilyEssential(byte[] 
name) throws IOException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    return 
filter.isFamilyEssential(name);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  @Override<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  public String toString() {<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    return 
this.getClass().getSimpleName() + " " + this.filter.toString();<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">081</span>  @Deprecated<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public ReturnCode filterKeyValue(final 
Cell c) throws IOException {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    return filterCell(c);<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @Override<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public ReturnCode filterCell(final Cell 
c) throws IOException {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    ReturnCode rc = 
filter.filterCell(c);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    changeFR(rc != ReturnCode.INCLUDE);<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    return rc;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public Cell transformCell(Cell v) 
throws IOException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    return filter.transformCell(v);<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>  public boolean filterRow() {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    return filterRow;<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    <a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public boolean hasFilterRow() {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    return true;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return The filter serialized using 
pb<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public byte[] toByteArray() throws 
IOException {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    FilterProtos.SkipFilter.Builder 
builder =<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      
FilterProtos.SkipFilter.newBuilder();<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    
builder.setFilter(ProtobufUtil.toFilter(this.filter));<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    return 
builder.build().toByteArray();<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>   * @param pbBytes A pb serialized 
{@link SkipFilter} instance<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * @return An instance of {@link 
SkipFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @throws DeserializationException<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>   * @see #toByteArray<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  public static SkipFilter 
parseFrom(final byte [] pbBytes)<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  throws DeserializationException {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    FilterProtos.SkipFilter proto;<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    try {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      proto = 
FilterProtos.SkipFilter.parseFrom(pbBytes);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      throw new 
DeserializationException(e);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    try {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return new 
SkipFilter(ProtobufUtil.toFilter(proto.getFilter()));<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    } catch (IOException ioe) {<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      throw new 
DeserializationException(ioe);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * @param o the other filter to compare 
with<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   */<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    if (o == this) return true;<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    if (!(o instanceof SkipFilter)) 
return false;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    SkipFilter other = (SkipFilter)o;<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>    return 
getFilter().areSerializedFieldsEqual(other.getFilter());<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public boolean isFamilyEssential(byte[] 
name) throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    return 
filter.isFamilyEssential(name);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  public String toString() {<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    return 
this.getClass().getSimpleName() + " " + this.filter.toString();<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>
 
 
 

Reply via email to