http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html
index e8c4959..5856e0d 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html
@@ -74,139 +74,145 @@
 <span class="sourceLineNo">066</span>    return false;<a name="line.66"></a>
 <span class="sourceLineNo">067</span>  }<a name="line.67"></a>
 <span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public ReturnCode filterKeyValue(Cell 
kv) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    if (sortedPrefixes.isEmpty()) {<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>      return ReturnCode.INCLUDE;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>    } else {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      return filterColumn(kv);<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><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public ReturnCode filterColumn(Cell 
cell) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    byte [] qualifier = 
CellUtil.cloneQualifier(cell);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    TreeSet&lt;byte []&gt; 
lesserOrEqualPrefixes =<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      (TreeSet&lt;byte []&gt;) 
sortedPrefixes.headSet(qualifier, true);<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>    if (lesserOrEqualPrefixes.size() != 
0) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      byte [] 
largestPrefixSmallerThanQualifier = lesserOrEqualPrefixes.last();<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      <a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (Bytes.startsWith(qualifier, 
largestPrefixSmallerThanQualifier)) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        return ReturnCode.INCLUDE;<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      <a name="line.89"></a>
-<span class="sourceLineNo">090</span>      if (lesserOrEqualPrefixes.size() == 
sortedPrefixes.size()) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        return ReturnCode.NEXT_ROW;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>      } else {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        hint = 
sortedPrefixes.higher(largestPrefixSmallerThanQualifier);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        return 
ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    } else {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      hint = sortedPrefixes.first();<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>      return 
ReturnCode.SEEK_NEXT_USING_HINT;<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    byte [][] prefixes = new byte 
[filterArguments.size()][];<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    for (int i = 0 ; i &lt; 
filterArguments.size(); i++) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      byte [] columnPrefix = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(i));<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      prefixes[i] = columnPrefix;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    return new 
MultipleColumnPrefixFilter(prefixes);<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>   * @return The filter serialized using 
pb<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  public byte [] toByteArray() {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>    
FilterProtos.MultipleColumnPrefixFilter.Builder builder =<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      
FilterProtos.MultipleColumnPrefixFilter.newBuilder();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    for (byte [] element : 
sortedPrefixes) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      if (element != null) 
builder.addSortedPrefixes(UnsafeByteOperations.unsafeWrap(element));<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    return 
builder.build().toByteArray();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  }<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>   * @param pbBytes A pb serialized 
{@link MultipleColumnPrefixFilter} instance<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   * @return An instance of {@link 
MultipleColumnPrefixFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>   * @throws DeserializationException<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>   * @see #toByteArray<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>   */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  public static 
MultipleColumnPrefixFilter parseFrom(final byte [] pbBytes)<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>  throws DeserializationException {<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    
FilterProtos.MultipleColumnPrefixFilter proto;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      proto = 
FilterProtos.MultipleColumnPrefixFilter.parseFrom(pbBytes);<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      throw new 
DeserializationException(e);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    int numPrefixes = 
proto.getSortedPrefixesCount();<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    byte [][] prefixes = new 
byte[numPrefixes][];<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    for (int i = 0; i &lt; numPrefixes; 
++i) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      prefixes[i] = 
proto.getSortedPrefixes(i).toByteArray();<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>    return new 
MultipleColumnPrefixFilter(prefixes);<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>  /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * @param other<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    if (o == this) return true;<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    if (!(o instanceof 
MultipleColumnPrefixFilter)) return false;<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    MultipleColumnPrefixFilter other = 
(MultipleColumnPrefixFilter)o;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    return 
this.sortedPrefixes.equals(other.sortedPrefixes);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public Cell getNextCellHint(Cell cell) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return 
CellUtil.createFirstOnRowCol(cell, hint, 0, hint.length);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public TreeSet&lt;byte []&gt; 
createTreeSet() {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return new TreeSet&lt;&gt;(new 
Comparator&lt;Object&gt;() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        @Override<a name="line.166"></a>
-<span class="sourceLineNo">167</span>          public int compare (Object o1, 
Object o2) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>          if (o1 == null || o2 == null)<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>            throw new 
IllegalArgumentException ("prefixes can't be null");<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>          byte [] b1 = (byte []) o1;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>          byte [] b2 = (byte []) o2;<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>          return Bytes.compareTo (b1, 0, 
b1.length, b2, 0, b2.length);<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><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  @Override<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public String toString() {<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    return toString(MAX_LOG_PREFIXES);<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  protected String toString(int 
maxPrefixes) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    StringBuilder prefixes = new 
StringBuilder();<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>    int count = 0;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    for (byte[] ba : this.sortedPrefixes) 
{<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      if (count &gt;= maxPrefixes) {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>        break;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      ++count;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      
prefixes.append(Bytes.toStringBinary(ba));<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (count &lt; 
this.sortedPrefixes.size() &amp;&amp; count &lt; maxPrefixes) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        prefixes.append(", ");<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>    return String.format("%s (%d/%d): 
[%s]", this.getClass().getSimpleName(),<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        count, 
this.sortedPrefixes.size(), prefixes.toString());<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">069</span>  @Deprecated<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    return filterCell(c);<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    if (sortedPrefixes.isEmpty()) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>      return ReturnCode.INCLUDE;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    } else {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      return filterColumn(c);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  public ReturnCode filterColumn(Cell 
cell) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    byte [] qualifier = 
CellUtil.cloneQualifier(cell);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    TreeSet&lt;byte []&gt; 
lesserOrEqualPrefixes =<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      (TreeSet&lt;byte []&gt;) 
sortedPrefixes.headSet(qualifier, true);<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    if (lesserOrEqualPrefixes.size() != 
0) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      byte [] 
largestPrefixSmallerThanQualifier = lesserOrEqualPrefixes.last();<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      <a name="line.91"></a>
+<span class="sourceLineNo">092</span>      if (Bytes.startsWith(qualifier, 
largestPrefixSmallerThanQualifier)) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        return ReturnCode.INCLUDE;<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      <a name="line.95"></a>
+<span class="sourceLineNo">096</span>      if (lesserOrEqualPrefixes.size() == 
sortedPrefixes.size()) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        return ReturnCode.NEXT_ROW;<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      } else {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        hint = 
sortedPrefixes.higher(largestPrefixSmallerThanQualifier);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        return 
ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    } else {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      hint = sortedPrefixes.first();<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>      return 
ReturnCode.SEEK_NEXT_USING_HINT;<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    byte [][] prefixes = new byte 
[filterArguments.size()][];<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    for (int i = 0 ; i &lt; 
filterArguments.size(); i++) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      byte [] columnPrefix = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(i));<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      prefixes[i] = columnPrefix;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    return new 
MultipleColumnPrefixFilter(prefixes);<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 filter serialized using 
pb<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public byte [] toByteArray() {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    
FilterProtos.MultipleColumnPrefixFilter.Builder builder =<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      
FilterProtos.MultipleColumnPrefixFilter.newBuilder();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    for (byte [] element : 
sortedPrefixes) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      if (element != null) 
builder.addSortedPrefixes(UnsafeByteOperations.unsafeWrap(element));<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return 
builder.build().toByteArray();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>  /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * @param pbBytes A pb serialized 
{@link MultipleColumnPrefixFilter} instance<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @return An instance of {@link 
MultipleColumnPrefixFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @throws DeserializationException<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @see #toByteArray<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>   */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  public static 
MultipleColumnPrefixFilter parseFrom(final byte [] pbBytes)<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>  throws DeserializationException {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    
FilterProtos.MultipleColumnPrefixFilter proto;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    try {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      proto = 
FilterProtos.MultipleColumnPrefixFilter.parseFrom(pbBytes);<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      throw new 
DeserializationException(e);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int numPrefixes = 
proto.getSortedPrefixesCount();<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    byte [][] prefixes = new 
byte[numPrefixes][];<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    for (int i = 0; i &lt; numPrefixes; 
++i) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      prefixes[i] = 
proto.getSortedPrefixes(i).toByteArray();<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>    return new 
MultipleColumnPrefixFilter(prefixes);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * @param o the other filter to compare 
with<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    if (o == this) return true;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (!(o instanceof 
MultipleColumnPrefixFilter)) return false;<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    MultipleColumnPrefixFilter other = 
(MultipleColumnPrefixFilter)o;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    return 
this.sortedPrefixes.equals(other.sortedPrefixes);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  public Cell getNextCellHint(Cell cell) 
{<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    return 
CellUtil.createFirstOnRowCol(cell, hint, 0, hint.length);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span>  public TreeSet&lt;byte []&gt; 
createTreeSet() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    return new TreeSet&lt;&gt;(new 
Comparator&lt;Object&gt;() {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>          public int compare (Object o1, 
Object o2) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          if (o1 == null || o2 == null)<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>            throw new 
IllegalArgumentException ("prefixes can't be null");<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>          byte [] b1 = (byte []) o1;<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>          byte [] b2 = (byte []) o2;<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>          return Bytes.compareTo (b1, 0, 
b1.length, b2, 0, b2.length);<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>  }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  @Override<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public String toString() {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    return toString(MAX_LOG_PREFIXES);<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>  protected String toString(int 
maxPrefixes) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    StringBuilder prefixes = new 
StringBuilder();<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>    int count = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    for (byte[] ba : this.sortedPrefixes) 
{<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      if (count &gt;= maxPrefixes) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>        break;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      ++count;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      
prefixes.append(Bytes.toStringBinary(ba));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      if (count &lt; 
this.sortedPrefixes.size() &amp;&amp; count &lt; maxPrefixes) {<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>        prefixes.append(", ");<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>    return String.format("%s (%d/%d): 
[%s]", this.getClass().getSimpleName(),<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        count, 
this.sortedPrefixes.size(), prefixes.toString());<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>}<a name="line.207"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/PageFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/PageFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/PageFilter.html
index 79c4164..00b536e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/PageFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/PageFilter.html
@@ -73,76 +73,82 @@
 <span class="sourceLineNo">065</span>    return false;<a name="line.65"></a>
 <span class="sourceLineNo">066</span>  }<a name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public ReturnCode filterKeyValue(Cell 
ignored) throws IOException {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    return ReturnCode.INCLUDE;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  <a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public boolean filterAllRemaining() {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    return this.rowsAccepted &gt;= 
this.pageSize;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  public boolean filterRow() {<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    this.rowsAccepted++;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>    return this.rowsAccepted &gt; 
this.pageSize;<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>  public boolean hasFilterRow() {<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    return true;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>    
Preconditions.checkArgument(filterArguments.size() == 1,<a name="line.87"></a>
-<span class="sourceLineNo">088</span>                                "Expected 
1 but got: %s", filterArguments.size());<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    long pageSize = 
ParseFilter.convertByteArrayToLong(filterArguments.get(0));<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    return new PageFilter(pageSize);<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * @return The filter serialized using 
pb<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public byte [] toByteArray() {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    FilterProtos.PageFilter.Builder 
builder =<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      
FilterProtos.PageFilter.newBuilder();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    builder.setPageSize(this.pageSize);<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @param pbBytes A pb serialized 
{@link PageFilter} instance<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * @return An instance of {@link 
PageFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * @throws DeserializationException<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @see #toByteArray<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public static PageFilter 
parseFrom(final byte [] pbBytes)<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  throws DeserializationException {<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    FilterProtos.PageFilter proto;<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    try {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      proto = 
FilterProtos.PageFilter.parseFrom(pbBytes);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      throw new 
DeserializationException(e);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return new 
PageFilter(proto.getPageSize());<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>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @param other<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (o == this) return true;<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    if (!(o instanceof PageFilter)) 
return false;<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    PageFilter other = (PageFilter)o;<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    return this.getPageSize() == 
other.getPageSize();<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>  @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public String toString() {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    return 
this.getClass().getSimpleName() + " " + this.pageSize;<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">068</span>  @Deprecated<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public ReturnCode filterKeyValue(final 
Cell c) throws IOException {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    return filterCell(c);<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public ReturnCode filterCell(final Cell 
ignored) throws IOException {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    return ReturnCode.INCLUDE;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  <a name="line.78"></a>
+<span class="sourceLineNo">079</span>  public boolean filterAllRemaining() {<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>    return this.rowsAccepted &gt;= 
this.pageSize;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public boolean filterRow() {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>    this.rowsAccepted++;<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    return this.rowsAccepted &gt; 
this.pageSize;<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>  public boolean hasFilterRow() {<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    return true;<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    
Preconditions.checkArgument(filterArguments.size() == 1,<a name="line.93"></a>
+<span class="sourceLineNo">094</span>                                "Expected 
1 but got: %s", filterArguments.size());<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    long pageSize = 
ParseFilter.convertByteArrayToLong(filterArguments.get(0));<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    return new PageFilter(pageSize);<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>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @return The filter serialized using 
pb<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public byte [] toByteArray() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    FilterProtos.PageFilter.Builder 
builder =<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      
FilterProtos.PageFilter.newBuilder();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    builder.setPageSize(this.pageSize);<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    return 
builder.build().toByteArray();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * @param pbBytes A pb serialized 
{@link PageFilter} instance<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * @return An instance of {@link 
PageFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * @throws DeserializationException<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>   * @see #toByteArray<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public static PageFilter 
parseFrom(final byte [] pbBytes)<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  throws DeserializationException {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    FilterProtos.PageFilter proto;<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    try {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      proto = 
FilterProtos.PageFilter.parseFrom(pbBytes);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      throw new 
DeserializationException(e);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    return new 
PageFilter(proto.getPageSize());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  /**<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @param other<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    if (o == this) return true;<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>    if (!(o instanceof PageFilter)) 
return false;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    PageFilter other = (PageFilter)o;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    return this.getPageSize() == 
other.getPageSize();<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>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public String toString() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    return 
this.getClass().getSimpleName() + " " + this.pageSize;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/PrefixFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/PrefixFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/PrefixFilter.html
index e53eb75..00cb205 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/PrefixFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/PrefixFilter.html
@@ -83,76 +83,82 @@
 <span class="sourceLineNo">075</span>    return filterRow;<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>  @Override<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public ReturnCode filterKeyValue(Cell 
v) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    if (filterRow) return 
ReturnCode.NEXT_ROW;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    return ReturnCode.INCLUDE;<a 
name="line.81"></a>
+<span class="sourceLineNo">078</span>  @Deprecated<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    return filterCell(c);<a 
name="line.81"></a>
 <span class="sourceLineNo">082</span>  }<a name="line.82"></a>
 <span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public boolean filterRow() {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    return filterRow;<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>  public void reset() {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>    filterRow = true;<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>  public boolean filterAllRemaining() {<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    return passedPrefix;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    
Preconditions.checkArgument(filterArguments.size() == 1,<a name="line.97"></a>
-<span class="sourceLineNo">098</span>                                "Expected 
1 but got: %s", filterArguments.size());<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    byte [] prefix = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    return new PrefixFilter(prefix);<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>  /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @return The filter serialized using 
pb<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public byte [] toByteArray() {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    FilterProtos.PrefixFilter.Builder 
builder =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      
FilterProtos.PrefixFilter.newBuilder();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    if (this.prefix != null) 
builder.setPrefix(UnsafeByteOperations.unsafeWrap(this.prefix));<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @param pbBytes A pb serialized 
{@link PrefixFilter} instance<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @return An instance of {@link 
PrefixFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * @throws 
org.apache.hadoop.hbase.exceptions.DeserializationException<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   * @see #toByteArray<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  public static PrefixFilter 
parseFrom(final byte [] pbBytes)<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  throws DeserializationException {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    FilterProtos.PrefixFilter proto;<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>    try {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      proto = 
FilterProtos.PrefixFilter.parseFrom(pbBytes);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      throw new 
DeserializationException(e);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    return new 
PrefixFilter(proto.hasPrefix()?proto.getPrefix().toByteArray():null);<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>   * @param other<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   */<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    if (o == this) return true;<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    if (!(o instanceof PrefixFilter)) 
return false;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    PrefixFilter other = 
(PrefixFilter)o;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    return Bytes.equals(this.getPrefix(), 
other.getPrefix());<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  @Override<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public String toString() {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    return 
this.getClass().getSimpleName() + " " + Bytes.toStringBinary(this.prefix);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>}<a name="line.147"></a>
+<span class="sourceLineNo">084</span>  @Override<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    if (filterRow) return 
ReturnCode.NEXT_ROW;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    return ReturnCode.INCLUDE;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public boolean filterRow() {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    return filterRow;<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>  public void reset() {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    filterRow = true;<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>  public boolean filterAllRemaining() {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    return passedPrefix;<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    
Preconditions.checkArgument(filterArguments.size() == 1,<a name="line.103"></a>
+<span class="sourceLineNo">104</span>                                "Expected 
1 but got: %s", filterArguments.size());<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    byte [] prefix = 
ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    return new PrefixFilter(prefix);<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * @return The filter serialized using 
pb<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public byte [] toByteArray() {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    FilterProtos.PrefixFilter.Builder 
builder =<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      
FilterProtos.PrefixFilter.newBuilder();<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    if (this.prefix != null) 
builder.setPrefix(UnsafeByteOperations.unsafeWrap(this.prefix));<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @param pbBytes A pb serialized 
{@link PrefixFilter} instance<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   * @return An instance of {@link 
PrefixFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * @throws 
org.apache.hadoop.hbase.exceptions.DeserializationException<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>   * @see #toByteArray<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public static PrefixFilter 
parseFrom(final byte [] pbBytes)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  throws DeserializationException {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    FilterProtos.PrefixFilter proto;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      proto = 
FilterProtos.PrefixFilter.parseFrom(pbBytes);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      throw new 
DeserializationException(e);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return new 
PrefixFilter(proto.hasPrefix()?proto.getPrefix().toByteArray():null);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * @param o the other filter to compare 
with<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    if (o == this) return true;<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>    if (!(o instanceof PrefixFilter)) 
return false;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    PrefixFilter other = 
(PrefixFilter)o;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    return Bytes.equals(this.getPrefix(), 
other.getPrefix());<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() + " " + Bytes.toStringBinary(this.prefix);<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>
 
 
 

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

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/apidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
index 48747de..eb13846 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/RandomRowFilter.html
@@ -77,83 +77,89 @@
 <span class="sourceLineNo">069</span>    return false;<a name="line.69"></a>
 <span class="sourceLineNo">070</span>  }<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public ReturnCode filterKeyValue(Cell 
v) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    if (filterOutRow) {<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>      return ReturnCode.NEXT_ROW;<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    return ReturnCode.INCLUDE;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  @Override<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public boolean filterRow() {<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>    return filterOutRow;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  <a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public boolean hasFilterRow() {<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>    return true;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>  @Override<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  public boolean filterRowKey(Cell 
firstRowCell) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    if (chance &lt; 0) {<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>      // with a zero chance, the rows is 
always excluded<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      filterOutRow = true;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    } else if (chance &gt; 1) {<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      // always included<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      filterOutRow = false;<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    } else {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      // roll the dice<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>      filterOutRow = !(random.nextFloat() 
&lt; chance);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    return filterOutRow;<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>  @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  public void reset() {<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>    filterOutRow = false;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @return The filter serialized using 
pb<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   */<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public byte [] toByteArray() {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    FilterProtos.RandomRowFilter.Builder 
builder =<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      
FilterProtos.RandomRowFilter.newBuilder();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    builder.setChance(this.chance);<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * @param pbBytes A pb serialized 
{@link RandomRowFilter} instance<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @return An instance of {@link 
RandomRowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @throws DeserializationException<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @see #toByteArray<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static RandomRowFilter 
parseFrom(final byte [] pbBytes)<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  throws DeserializationException {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    FilterProtos.RandomRowFilter proto;<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    try {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      proto = 
FilterProtos.RandomRowFilter.parseFrom(pbBytes);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throw new 
DeserializationException(e);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return new 
RandomRowFilter(proto.getChance());<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   * @param other<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    if (o == this) return true;<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    if (!(o instanceof RandomRowFilter)) 
return false;<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    RandomRowFilter other = 
(RandomRowFilter)o;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    return this.getChance() == 
other.getChance();<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">072</span>  @Deprecated<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    return filterCell(c);<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>  @Override<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    if (filterOutRow) {<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>      return ReturnCode.NEXT_ROW;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    return ReturnCode.INCLUDE;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public boolean filterRow() {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    return filterOutRow;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  <a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public boolean hasFilterRow() {<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    return true;<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 filterRowKey(Cell 
firstRowCell) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    if (chance &lt; 0) {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      // with a zero chance, the rows is 
always excluded<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      filterOutRow = true;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    } else if (chance &gt; 1) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>      // always included<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>      filterOutRow = false;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    } else {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      // roll the dice<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>      filterOutRow = !(random.nextFloat() 
&lt; chance);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    return filterOutRow;<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  @Override<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  public void reset() {<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    filterOutRow = false;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @return The filter serialized using 
pb<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  public byte [] toByteArray() {<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    FilterProtos.RandomRowFilter.Builder 
builder =<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      
FilterProtos.RandomRowFilter.newBuilder();<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    builder.setChance(this.chance);<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    return 
builder.build().toByteArray();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  /**<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @param pbBytes A pb serialized 
{@link RandomRowFilter} instance<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @return An instance of {@link 
RandomRowFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @throws DeserializationException<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>   * @see #toByteArray<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  public static RandomRowFilter 
parseFrom(final byte [] pbBytes)<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  throws DeserializationException {<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>    FilterProtos.RandomRowFilter proto;<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      proto = 
FilterProtos.RandomRowFilter.parseFrom(pbBytes);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      throw new 
DeserializationException(e);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    return new 
RandomRowFilter(proto.getChance());<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * @param o the other filter to compare 
with<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   */<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    if (o == this) return true;<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    if (!(o instanceof RandomRowFilter)) 
return false;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>    RandomRowFilter other = 
(RandomRowFilter)o;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    return this.getChance() == 
other.getChance();<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>
 
 
 

Reply via email to