[17/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

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

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/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 a214677..493dd8f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
@@ -104,67 +104,72 @@
 <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">099</span>  @Override<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public boolean filterRow() {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    return filterRow;<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 boolean hasFilterRow() {<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    return true;<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>  @Override<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public byte[] toByteArray() throws 
IOException {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    FilterProtos.SkipFilter.Builder 
builder =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      
FilterProtos.SkipFilter.newBuilder();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    
builder.setFilter(ProtobufUtil.toFilter(this.filter));<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return 
builder.build().toByteArray();<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 pbBytes A pb serialized 
{@link SkipFilter} instance<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * @return An instance of {@link 
SkipFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * @throws DeserializationException<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>   * @see #toByteArray<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  public static SkipFilter 
parseFrom(final byte [] pbBytes)<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  throws DeserializationException {<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    FilterProtos.SkipFilter proto;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      proto = 
FilterProtos.SkipFilter.parseFrom(pbBytes);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      throw new 
DeserializationException(e);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      return new 
SkipFilter(ProtobufUtil.toFilter(proto.getFilter()));<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    } catch (IOException ioe) {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      throw new 
DeserializationException(ioe);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  }<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>   * @param o the other filter to compare 
with<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  @Override<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 SkipFilter)) 
return false;<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">151</span>    SkipFilter other = (SkipFilter)o;<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    return 
getFilter().areSerializedFieldsEqual(other.getFilter());<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">156</span>  public boolean isFamilyEssential(byte[] 
name) throws IOException {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return 
filter.isFamilyEssential(name);<a name="line.157"></a>
 <span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>}<a name="line.159"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  @Override<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  public String toString() {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    return 
this.getClass().getSimpleName() + " " + this.filter.toString();<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
index bf86453..a61c7bf 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
@@ -78,45 +78,47 @@
 <span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
 <span class="sourceLineNo">071</span>   * @return The comparator serialized 
using pb<a name="line.71"></a>
 <span class="sourceLineNo">072</span>   */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public byte [] toByteArray() {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    
ComparatorProtos.SubstringComparator.Builder builder =<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      
ComparatorProtos.SubstringComparator.newBuilder();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    builder.setSubstr(this.substr);<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   * @param pbBytes A pb serialized 
{@link SubstringComparator} instance<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * @return An instance of {@link 
SubstringComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>   * @throws DeserializationException<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>   * @see #toByteArray<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>   */<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public static SubstringComparator 
parseFrom(final byte [] pbBytes)<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  throws DeserializationException {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    ComparatorProtos.SubstringComparator 
proto;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    try {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      proto = 
ComparatorProtos.SubstringComparator.parseFrom(pbBytes);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      throw new 
DeserializationException(e);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    return new 
SubstringComparator(proto.getSubstr());<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>   * @param other<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    if (other == this) return true;<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    if (!(other instanceof 
SubstringComparator)) return false;<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>    SubstringComparator comparator = 
(SubstringComparator)other;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    return 
super.areSerializedFieldsEqual(comparator)<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      &amp;&amp; 
this.substr.equals(comparator.substr);<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">073</span>  @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public byte [] toByteArray() {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    
ComparatorProtos.SubstringComparator.Builder builder =<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      
ComparatorProtos.SubstringComparator.newBuilder();<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    builder.setSubstr(this.substr);<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * @param pbBytes A pb serialized 
{@link SubstringComparator} instance<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @return An instance of {@link 
SubstringComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @throws DeserializationException<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @see #toByteArray<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public static SubstringComparator 
parseFrom(final byte [] pbBytes)<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  throws DeserializationException {<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    ComparatorProtos.SubstringComparator 
proto;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      proto = 
ComparatorProtos.SubstringComparator.parseFrom(pbBytes);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      throw new 
DeserializationException(e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    return new 
SubstringComparator(proto.getSubstr());<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   * @param other<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  @Override<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    if (other == this) return true;<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    if (!(other instanceof 
SubstringComparator)) return false;<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>    SubstringComparator comparator = 
(SubstringComparator)other;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    return 
super.areSerializedFieldsEqual(comparator)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      &amp;&amp; 
this.substr.equals(comparator.substr);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
index 223370c..a88b40e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
@@ -143,106 +143,109 @@
 <span class="sourceLineNo">135</span>   *<a name="line.135"></a>
 <span class="sourceLineNo">136</span>   * @throws IOException This will never 
happen.<a name="line.136"></a>
 <span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public Cell getNextCellHint(Cell 
currentCell) throws IOException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (!canHint) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      return null;<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>    Long nextTimestampObject = 
timestamps.lower(currentCell.getTimestamp());<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    if (nextTimestampObject == null) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>      // This should only happen if the 
current column's<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      // timestamp is below the last one 
in the list.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      //<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      // It should never happen as the 
filterCell should return NEXT_COL<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      // but it's always better to be 
extra safe and protect against future<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      // behavioral changes.<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>      return 
PrivateCellUtil.createLastOnRowCol(currentCell);<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">156</span>    // Since we know the 
nextTimestampObject isn't null here there must still be<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    // timestamps that can be included. 
Cast the Long to a long and return the<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    // a cell with the current row/cf/col 
and the next found timestamp.<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    long nextTimestamp = 
nextTimestampObject;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    return 
PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    ArrayList&lt;Long&gt; timestamps = 
new ArrayList&lt;&gt;(filterArguments.size());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    for (int i = 0; 
i&lt;filterArguments.size(); i++) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      long timestamp = 
ParseFilter.convertByteArrayToLong(filterArguments.get(i));<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>      timestamps.add(timestamp);<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    return new 
TimestampsFilter(timestamps);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>  /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * @return The filter serialized using 
pb<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  public byte[] toByteArray() {<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>    FilterProtos.TimestampsFilter.Builder 
builder =<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        
FilterProtos.TimestampsFilter.newBuilder();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
builder.addAllTimestamps(this.timestamps);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    builder.setCanHint(canHint);<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    return 
builder.build().toByteArray();<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>   * @param pbBytes A pb serialized 
{@link TimestampsFilter} instance<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   *<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @return An instance of {@link 
TimestampsFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>   * @see #toByteArray<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>   */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  public static TimestampsFilter 
parseFrom(final byte[] pbBytes)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      throws DeserializationException {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    FilterProtos.TimestampsFilter 
proto;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    try {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      proto = 
FilterProtos.TimestampsFilter.parseFrom(pbBytes);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      throw new 
DeserializationException(e);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    return new 
TimestampsFilter(proto.getTimestampsList(),<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        proto.hasCanHint() &amp;&amp; 
proto.getCanHint());<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * @param o the other filter to compare 
with<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   */<a name="line.205"></a>
-<span class="sourceLineNo">206</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    if (o == this) return true;<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>    if (!(o instanceof TimestampsFilter)) 
return false;<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>    TimestampsFilter other = 
(TimestampsFilter)o;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    return 
this.getTimestamps().equals(other.getTimestamps());<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  @Override<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  public String toString() {<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    return 
toString(MAX_LOG_TIMESTAMPS);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>  protected String toString(int 
maxTimestamps) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    StringBuilder tsList = new 
StringBuilder();<a name="line.220"></a>
+<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public Cell getNextCellHint(Cell 
currentCell) throws IOException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (!canHint) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      return null;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    Long nextTimestampObject = 
timestamps.lower(currentCell.getTimestamp());<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    if (nextTimestampObject == null) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>      // This should only happen if the 
current column's<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      // timestamp is below the last one 
in the list.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      //<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      // It should never happen as the 
filterCell should return NEXT_COL<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      // but it's always better to be 
extra safe and protect against future<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      // behavioral changes.<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>      return 
PrivateCellUtil.createLastOnRowCol(currentCell);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    // Since we know the 
nextTimestampObject isn't null here there must still be<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    // timestamps that can be included. 
Cast the Long to a long and return the<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    // a cell with the current row/cf/col 
and the next found timestamp.<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    long nextTimestamp = 
nextTimestampObject;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return 
PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<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 static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>    ArrayList&lt;Long&gt; timestamps = 
new ArrayList&lt;&gt;(filterArguments.size());<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    for (int i = 0; 
i&lt;filterArguments.size(); i++) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      long timestamp = 
ParseFilter.convertByteArrayToLong(filterArguments.get(i));<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      timestamps.add(timestamp);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    return new 
TimestampsFilter(timestamps);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>  /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @return The filter serialized using 
pb<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  public byte[] toByteArray() {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    FilterProtos.TimestampsFilter.Builder 
builder =<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        
FilterProtos.TimestampsFilter.newBuilder();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    
builder.addAllTimestamps(this.timestamps);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    builder.setCanHint(canHint);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>    return 
builder.build().toByteArray();<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  /**<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   * @param pbBytes A pb serialized 
{@link TimestampsFilter} instance<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   *<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @return An instance of {@link 
TimestampsFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @see #toByteArray<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  public static TimestampsFilter 
parseFrom(final byte[] pbBytes)<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      throws DeserializationException {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>    FilterProtos.TimestampsFilter 
proto;<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    try {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      proto = 
FilterProtos.TimestampsFilter.parseFrom(pbBytes);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      throw new 
DeserializationException(e);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    return new 
TimestampsFilter(proto.getTimestampsList(),<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        proto.hasCanHint() &amp;&amp; 
proto.getCanHint());<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>   * @param o the other filter to compare 
with<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  @Override<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    if (o == this) return true;<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>    if (!(o instanceof TimestampsFilter)) 
return false;<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>    TimestampsFilter other = 
(TimestampsFilter)o;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    return 
this.getTimestamps().equals(other.getTimestamps());<a name="line.214"></a>
+<span class="sourceLineNo">215</span>  }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>  @Override<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  public String toString() {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>    return 
toString(MAX_LOG_TIMESTAMPS);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
 <span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    int count = 0;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    for (Long ts : this.timestamps) {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>      if (count &gt;= maxTimestamps) {<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>        break;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      ++count;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      tsList.append(ts.toString());<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      if (count &lt; 
this.timestamps.size() &amp;&amp; count &lt; maxTimestamps) {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>        tsList.append(", ");<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    return String.format("%s (%d/%d): 
[%s] canHint: [%b]", this.getClass().getSimpleName(),<a name="line.234"></a>
-<span class="sourceLineNo">235</span>        count, this.timestamps.size(), 
tsList.toString(), canHint);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>}<a name="line.237"></a>
+<span class="sourceLineNo">222</span>  protected String toString(int 
maxTimestamps) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    StringBuilder tsList = new 
StringBuilder();<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>    int count = 0;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    for (Long ts : this.timestamps) {<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>      if (count &gt;= maxTimestamps) {<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>        break;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      ++count;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      tsList.append(ts.toString());<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>      if (count &lt; 
this.timestamps.size() &amp;&amp; count &lt; maxTimestamps) {<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>        tsList.append(", ");<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>      }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>    return String.format("%s (%d/%d): 
[%s] canHint: [%b]", this.getClass().getSimpleName(),<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        count, this.timestamps.size(), 
tsList.toString(), canHint);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>}<a name="line.240"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ValueFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ValueFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/ValueFilter.html
index 7492b39..0d99592 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ValueFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ValueFilter.html
@@ -101,52 +101,53 @@
 <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.ValueFilter.Builder 
builder =<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      
FilterProtos.ValueFilter.newBuilder();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    
builder.setCompareFilter(super.convert());<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 ValueFilter} instance<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * @return An instance of {@link 
ValueFilter} 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 ValueFilter 
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.ValueFilter proto;<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    try {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      proto = 
FilterProtos.ValueFilter.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>    final CompareOperator valueCompareOp 
=<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      
CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    ByteArrayComparable valueComparator = 
null;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      if 
(proto.getCompareFilter().hasComparator()) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        valueComparator = 
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    } catch (IOException ioe) {<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>      throw new 
DeserializationException(ioe);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    return new 
ValueFilter(valueCompareOp,valueComparator);<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><a name="line.131"></a>
+<span class="sourceLineNo">096</span>  @Override<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public byte [] toByteArray() {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    FilterProtos.ValueFilter.Builder 
builder =<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      
FilterProtos.ValueFilter.newBuilder();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    
builder.setCompareFilter(super.convert());<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    return 
builder.build().toByteArray();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param pbBytes A pb serialized 
{@link ValueFilter} instance<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @return An instance of {@link 
ValueFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @throws DeserializationException<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @see #toByteArray<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public static ValueFilter 
parseFrom(final byte [] pbBytes)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  throws DeserializationException {<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    FilterProtos.ValueFilter proto;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      proto = 
FilterProtos.ValueFilter.parseFrom(pbBytes);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      throw new 
DeserializationException(e);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    final CompareOperator valueCompareOp 
=<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      
CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    ByteArrayComparable valueComparator = 
null;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      if 
(proto.getCompareFilter().hasComparator()) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        valueComparator = 
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>      }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    } catch (IOException ioe) {<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      throw new 
DeserializationException(ioe);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    return new 
ValueFilter(valueCompareOp,valueComparator);<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>   * @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 ValueFilter)) 
return false;<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    return 
super.areSerializedFieldsEqual(o);<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">135</span>  @Override<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    if (o == this) return true;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>    if (!(o instanceof ValueFilter)) 
return false;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    return 
super.areSerializedFieldsEqual(o);<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>