You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/03/08 19:06:07 UTC
[32/34] hbase-site git commit: Published site at
46cc3d4972d8db478c86e9848afed523cb6dc866.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/58f51408/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html
index e9976c1..b2e9331 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html
@@ -262,230 +262,253 @@
<span class="sourceLineNo">254</span> ReturnCode rc = operator == Operator.MUST_PASS_ONE?<a name="line.254"></a>
<span class="sourceLineNo">255</span> ReturnCode.SKIP: ReturnCode.INCLUDE;<a name="line.255"></a>
<span class="sourceLineNo">256</span> int listize = filters.size();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> for (int i = 0; i < listize; i++) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> Filter filter = filters.get(i);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (filter.filterAllRemaining()) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return ReturnCode.NEXT_ROW;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> ReturnCode code = filter.filterKeyValue(c);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> switch (code) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // Override INCLUDE and continue to evaluate.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> case INCLUDE_AND_NEXT_COL:<a name="line.266"></a>
-<span class="sourceLineNo">267</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL; // FindBugs SF_SWITCH_FALLTHROUGH<a name="line.267"></a>
-<span class="sourceLineNo">268</span> case INCLUDE:<a name="line.268"></a>
-<span class="sourceLineNo">269</span> transformed = filter.transformCell(transformed);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> continue;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> case SEEK_NEXT_USING_HINT:<a name="line.271"></a>
-<span class="sourceLineNo">272</span> seekHintFilter = filter;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return code;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> default:<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return code;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> if (filter.filterAllRemaining()) {<a name="line.278"></a>
+<span class="sourceLineNo">257</span> /*<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * When all filters in a MUST_PASS_ONE FilterList return a SEEK_USING_NEXT_HINT code,<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * we should return SEEK_NEXT_USING_HINT from the FilterList to utilize the lowest seek value.<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <a name="line.260"></a>
+<span class="sourceLineNo">261</span> * The following variable tracks whether any of the Filters returns ReturnCode other than<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * SEEK_NEXT_USING_HINT for MUST_PASS_ONE FilterList, in which case the optimization would<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * be skipped.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> boolean seenNonHintReturnCode = false;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> for (int i = 0; i < listize; i++) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> Filter filter = filters.get(i);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (filter.filterAllRemaining()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> return ReturnCode.NEXT_ROW;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ReturnCode code = filter.filterKeyValue(c);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> switch (code) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> // Override INCLUDE and continue to evaluate.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> case INCLUDE_AND_NEXT_COL:<a name="line.275"></a>
+<span class="sourceLineNo">276</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL; // FindBugs SF_SWITCH_FALLTHROUGH<a name="line.276"></a>
+<span class="sourceLineNo">277</span> case INCLUDE:<a name="line.277"></a>
+<span class="sourceLineNo">278</span> transformed = filter.transformCell(transformed);<a name="line.278"></a>
<span class="sourceLineNo">279</span> continue;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> switch (filter.filterKeyValue(c)) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> case INCLUDE:<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (rc != ReturnCode.INCLUDE_AND_NEXT_COL) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> rc = ReturnCode.INCLUDE;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> transformed = filter.transformCell(transformed);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> break;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> case INCLUDE_AND_NEXT_COL:<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL;<a name="line.290"></a>
-<span class="sourceLineNo">291</span> transformed = filter.transformCell(transformed);<a name="line.291"></a>
-<span class="sourceLineNo">292</span> // must continue here to evaluate all filters<a name="line.292"></a>
-<span class="sourceLineNo">293</span> break;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> case NEXT_ROW:<a name="line.294"></a>
-<span class="sourceLineNo">295</span> break;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> case SKIP:<a name="line.296"></a>
-<span class="sourceLineNo">297</span> break;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> case NEXT_COL:<a name="line.298"></a>
-<span class="sourceLineNo">299</span> break;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> case SEEK_NEXT_USING_HINT:<a name="line.300"></a>
+<span class="sourceLineNo">280</span> case SEEK_NEXT_USING_HINT:<a name="line.280"></a>
+<span class="sourceLineNo">281</span> seekHintFilter = filter;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return code;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> default:<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return code;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (filter.filterAllRemaining()) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> continue;<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> ReturnCode localRC = filter.filterKeyValue(c);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (localRC != ReturnCode.SEEK_NEXT_USING_HINT) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> seenNonHintReturnCode = true;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> switch (localRC) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> case INCLUDE:<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (rc != ReturnCode.INCLUDE_AND_NEXT_COL) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> rc = ReturnCode.INCLUDE;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> transformed = filter.transformCell(transformed);<a name="line.300"></a>
<span class="sourceLineNo">301</span> break;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> default:<a name="line.302"></a>
-<span class="sourceLineNo">303</span> throw new IllegalStateException("Received code is not valid.");<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> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> // Save the transformed Cell for transform():<a name="line.308"></a>
-<span class="sourceLineNo">309</span> this.transformedCell = transformed;<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> return rc;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> /**<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * Filters that never filter by modifying the returned List of Cells can<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * inherit this implementation that does nothing.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> *<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * {@inheritDoc}<a name="line.318"></a>
-<span class="sourceLineNo">319</span> */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> int listize = filters.size();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> for (int i = 0; i < listize; i++) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> filters.get(i).filterRowCells(cells);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> @Override<a name="line.328"></a>
-<span class="sourceLineNo">329</span> public boolean hasFilterRow() {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> int listize = filters.size();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (int i = 0; i < listize; i++) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (filters.get(i).hasFilterRow()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return true;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return false;<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> @Override<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public boolean filterRow() throws IOException {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> int listize = filters.size();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> for (int i = 0; i < listize; i++) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> Filter filter = filters.get(i);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (filter.filterRow()) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return true;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (!filter.filterRow()) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return false;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return operator == Operator.MUST_PASS_ONE;<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> /**<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * @return The filter serialized using pb<a name="line.358"></a>
-<span class="sourceLineNo">359</span> */<a name="line.359"></a>
-<span class="sourceLineNo">360</span> public byte[] toByteArray() throws IOException {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> FilterProtos.FilterList.Builder builder =<a name="line.361"></a>
-<span class="sourceLineNo">362</span> FilterProtos.FilterList.newBuilder();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.363"></a>
-<span class="sourceLineNo">364</span> int listize = filters.size();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> for (int i = 0; i < listize; i++) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return builder.build().toByteArray();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<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> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @throws DeserializationException<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * @see #toByteArray<a name="line.375"></a>
-<span class="sourceLineNo">376</span> */<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public static FilterList parseFrom(final byte [] pbBytes)<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throws DeserializationException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> FilterProtos.FilterList proto;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> try {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> } catch (InvalidProtocolBufferException e) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> throw new DeserializationException(e);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> List<Filter> rowFilters = new ArrayList<Filter>(proto.getFiltersCount());<a name="line.386"></a>
-<span class="sourceLineNo">387</span> try {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> List<org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter> filtersList =<a name="line.388"></a>
-<span class="sourceLineNo">389</span> proto.getFiltersList();<a name="line.389"></a>
-<span class="sourceLineNo">390</span> int listSize = filtersList.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> for (int i = 0; i < listSize; i++) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> } catch (IOException ioe) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> throw new DeserializationException(ioe);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return new FilterList(Operator.valueOf(proto.getOperator().name()),rowFilters);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @param other<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @return true if and only if the fields of the filter that are serialized<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.403"></a>
-<span class="sourceLineNo">404</span> */<a name="line.404"></a>
-<span class="sourceLineNo">405</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (other == this) return true;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (!(other instanceof FilterList)) return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> FilterList o = (FilterList)other;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return this.getOperator().equals(o.getOperator()) &&<a name="line.410"></a>
-<span class="sourceLineNo">411</span> ((this.getFilters() == o.getFilters())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> || this.getFilters().equals(o.getFilters()));<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> @Override<a name="line.415"></a>
-<span class="sourceLineNo">416</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> Cell keyHint = null;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> keyHint = seekHintFilter.getNextCellHint(currentCell);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return keyHint;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // If any condition can pass, we need to keep the min hint<a name="line.423"></a>
-<span class="sourceLineNo">424</span> int listize = filters.size();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> for (int i = 0; i < listize; i++) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Cell curKeyHint = filters.get(i).getNextCellHint(currentCell);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (curKeyHint == null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> // If we ever don't have a hint and this is must-pass-one, then no hint<a name="line.428"></a>
-<span class="sourceLineNo">429</span> return null;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> if (curKeyHint != null) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> // If this is the first hint we find, set it<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (keyHint == null) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> keyHint = curKeyHint;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> continue;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (CellComparator.COMPARATOR.compare(keyHint, curKeyHint) > 0) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> keyHint = curKeyHint;<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">302</span> case INCLUDE_AND_NEXT_COL:<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> transformed = filter.transformCell(transformed);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // must continue here to evaluate all filters<a name="line.305"></a>
+<span class="sourceLineNo">306</span> break;<a name="line.306"></a>
+<span class="sourceLineNo">307</span> case NEXT_ROW:<a name="line.307"></a>
+<span class="sourceLineNo">308</span> break;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> case SKIP:<a name="line.309"></a>
+<span class="sourceLineNo">310</span> break;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> case NEXT_COL:<a name="line.311"></a>
+<span class="sourceLineNo">312</span> break;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> case SEEK_NEXT_USING_HINT:<a name="line.313"></a>
+<span class="sourceLineNo">314</span> break;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> default:<a name="line.315"></a>
+<span class="sourceLineNo">316</span> throw new IllegalStateException("Received code is not valid.");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<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> // Save the transformed Cell for transform():<a name="line.321"></a>
+<span class="sourceLineNo">322</span> this.transformedCell = transformed;<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> /*<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * The seenNonHintReturnCode flag is intended only for Operator.MUST_PASS_ONE branch.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * If we have seen non SEEK_NEXT_USING_HINT ReturnCode, respect that ReturnCode.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> */<a name="line.327"></a>
+<span class="sourceLineNo">328</span> if (operator == Operator.MUST_PASS_ONE && !seenNonHintReturnCode) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span> return rc;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> /**<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * Filters that never filter by modifying the returned List of Cells can<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * inherit this implementation that does nothing.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> *<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * {@inheritDoc}<a name="line.338"></a>
+<span class="sourceLineNo">339</span> */<a name="line.339"></a>
+<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> int listize = filters.size();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> for (int i = 0; i < listize; i++) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> filters.get(i).filterRowCells(cells);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span> public boolean hasFilterRow() {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> int listize = filters.size();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> for (int i = 0; i < listize; i++) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> if (filters.get(i).hasFilterRow()) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> return true;<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> return false;<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> @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span> public boolean filterRow() throws IOException {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> int listize = filters.size();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (int i = 0; i < listize; i++) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> Filter filter = filters.get(i);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> if (filter.filterRow()) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> return true;<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (!filter.filterRow()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return false;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span> return operator == Operator.MUST_PASS_ONE;<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @return The filter serialized using pb<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public byte[] toByteArray() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> FilterProtos.FilterList.Builder builder =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> FilterProtos.FilterList.newBuilder();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.383"></a>
+<span class="sourceLineNo">384</span> int listize = filters.size();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (int i = 0; i < listize; i++) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span> return builder.build().toByteArray();<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> /**<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.393"></a>
+<span class="sourceLineNo">394</span> * @throws DeserializationException<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * @see #toByteArray<a name="line.395"></a>
+<span class="sourceLineNo">396</span> */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public static FilterList parseFrom(final byte [] pbBytes)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> throws DeserializationException {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> FilterProtos.FilterList proto;<a name="line.399"></a>
+<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> } catch (InvalidProtocolBufferException e) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw new DeserializationException(e);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> List<Filter> rowFilters = new ArrayList<Filter>(proto.getFiltersCount());<a name="line.406"></a>
+<span class="sourceLineNo">407</span> try {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> List<org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter> filtersList =<a name="line.408"></a>
+<span class="sourceLineNo">409</span> proto.getFiltersList();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> int listSize = filtersList.size();<a name="line.410"></a>
+<span class="sourceLineNo">411</span> for (int i = 0; i < listSize; i++) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<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> return new FilterList(Operator.valueOf(proto.getOperator().name()),rowFilters);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @param other<a name="line.421"></a>
+<span class="sourceLineNo">422</span> * @return true if and only if the fields of the filter that are serialized<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> */<a name="line.424"></a>
+<span class="sourceLineNo">425</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (other == this) return true;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> if (!(other instanceof FilterList)) return false;<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span> FilterList o = (FilterList)other;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> return this.getOperator().equals(o.getOperator()) &&<a name="line.430"></a>
+<span class="sourceLineNo">431</span> ((this.getFilters() == o.getFilters())<a name="line.431"></a>
+<span class="sourceLineNo">432</span> || this.getFilters().equals(o.getFilters()));<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span> @Override<a name="line.435"></a>
+<span class="sourceLineNo">436</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> Cell keyHint = null;<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> keyHint = seekHintFilter.getNextCellHint(currentCell);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> return keyHint;<a name="line.440"></a>
<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return keyHint;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> @Override<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> int listize = filters.size();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> for (int i = 0; i < listize; i++) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (filters.get(i).isFamilyEssential(name)) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return true;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> return false;<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 void setReversed(boolean reversed) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> int listize = filters.size();<a name="line.458"></a>
-<span class="sourceLineNo">459</span> for (int i = 0; i < listize; i++) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> filters.get(i).setReversed(reversed);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> this.reversed = reversed;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override<a name="line.465"></a>
-<span class="sourceLineNo">466</span> public String toString() {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> return toString(MAX_LOG_FILTERS);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> protected String toString(int maxFilters) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> int endIndex = this.filters.size() < maxFilters<a name="line.471"></a>
-<span class="sourceLineNo">472</span> ? this.filters.size() : maxFilters;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> return String.format("%s %s (%d/%d): %s",<a name="line.473"></a>
-<span class="sourceLineNo">474</span> this.getClass().getSimpleName(),<a name="line.474"></a>
-<span class="sourceLineNo">475</span> this.operator == Operator.MUST_PASS_ALL ? "AND" : "OR",<a name="line.475"></a>
-<span class="sourceLineNo">476</span> endIndex,<a name="line.476"></a>
-<span class="sourceLineNo">477</span> this.filters.size(),<a name="line.477"></a>
-<span class="sourceLineNo">478</span> this.filters.subList(0, endIndex).toString());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>}<a name="line.480"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> // If any condition can pass, we need to keep the min hint<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int listize = filters.size();<a name="line.444"></a>
+<span class="sourceLineNo">445</span> for (int i = 0; i < listize; i++) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> if (filters.get(i).filterAllRemaining()) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> continue;<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span> Cell curKeyHint = filters.get(i).getNextCellHint(currentCell);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (curKeyHint == null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // If we ever don't have a hint and this is must-pass-one, then no hint<a name="line.451"></a>
+<span class="sourceLineNo">452</span> return null;<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (curKeyHint != null) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // If this is the first hint we find, set it<a name="line.455"></a>
+<span class="sourceLineNo">456</span> if (keyHint == null) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> keyHint = curKeyHint;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> continue;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (CellComparator.COMPARATOR.compare(keyHint, curKeyHint) > 0) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> keyHint = curKeyHint;<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>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span> return keyHint;<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> @Override<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> int listize = filters.size();<a name="line.470"></a>
+<span class="sourceLineNo">471</span> for (int i = 0; i < listize; i++) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> if (filters.get(i).isFamilyEssential(name)) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> return true;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return false;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> @Override<a name="line.479"></a>
+<span class="sourceLineNo">480</span> public void setReversed(boolean reversed) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> int listize = filters.size();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> for (int i = 0; i < listize; i++) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> filters.get(i).setReversed(reversed);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> }<a name="line.484"></a>
+<span class="sourceLineNo">485</span> this.reversed = reversed;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> @Override<a name="line.488"></a>
+<span class="sourceLineNo">489</span> public String toString() {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> return toString(MAX_LOG_FILTERS);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span> protected String toString(int maxFilters) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> int endIndex = this.filters.size() < maxFilters<a name="line.494"></a>
+<span class="sourceLineNo">495</span> ? this.filters.size() : maxFilters;<a name="line.495"></a>
+<span class="sourceLineNo">496</span> return String.format("%s %s (%d/%d): %s",<a name="line.496"></a>
+<span class="sourceLineNo">497</span> this.getClass().getSimpleName(),<a name="line.497"></a>
+<span class="sourceLineNo">498</span> this.operator == Operator.MUST_PASS_ALL ? "AND" : "OR",<a name="line.498"></a>
+<span class="sourceLineNo">499</span> endIndex,<a name="line.499"></a>
+<span class="sourceLineNo">500</span> this.filters.size(),<a name="line.500"></a>
+<span class="sourceLineNo">501</span> this.filters.subList(0, endIndex).toString());<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span>}<a name="line.503"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/58f51408/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html
index e9976c1..b2e9331 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html
@@ -262,230 +262,253 @@
<span class="sourceLineNo">254</span> ReturnCode rc = operator == Operator.MUST_PASS_ONE?<a name="line.254"></a>
<span class="sourceLineNo">255</span> ReturnCode.SKIP: ReturnCode.INCLUDE;<a name="line.255"></a>
<span class="sourceLineNo">256</span> int listize = filters.size();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> for (int i = 0; i < listize; i++) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> Filter filter = filters.get(i);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (filter.filterAllRemaining()) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return ReturnCode.NEXT_ROW;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> ReturnCode code = filter.filterKeyValue(c);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> switch (code) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // Override INCLUDE and continue to evaluate.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> case INCLUDE_AND_NEXT_COL:<a name="line.266"></a>
-<span class="sourceLineNo">267</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL; // FindBugs SF_SWITCH_FALLTHROUGH<a name="line.267"></a>
-<span class="sourceLineNo">268</span> case INCLUDE:<a name="line.268"></a>
-<span class="sourceLineNo">269</span> transformed = filter.transformCell(transformed);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> continue;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> case SEEK_NEXT_USING_HINT:<a name="line.271"></a>
-<span class="sourceLineNo">272</span> seekHintFilter = filter;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return code;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> default:<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return code;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> if (filter.filterAllRemaining()) {<a name="line.278"></a>
+<span class="sourceLineNo">257</span> /*<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * When all filters in a MUST_PASS_ONE FilterList return a SEEK_USING_NEXT_HINT code,<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * we should return SEEK_NEXT_USING_HINT from the FilterList to utilize the lowest seek value.<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <a name="line.260"></a>
+<span class="sourceLineNo">261</span> * The following variable tracks whether any of the Filters returns ReturnCode other than<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * SEEK_NEXT_USING_HINT for MUST_PASS_ONE FilterList, in which case the optimization would<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * be skipped.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> boolean seenNonHintReturnCode = false;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> for (int i = 0; i < listize; i++) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> Filter filter = filters.get(i);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (filter.filterAllRemaining()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> return ReturnCode.NEXT_ROW;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ReturnCode code = filter.filterKeyValue(c);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> switch (code) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> // Override INCLUDE and continue to evaluate.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> case INCLUDE_AND_NEXT_COL:<a name="line.275"></a>
+<span class="sourceLineNo">276</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL; // FindBugs SF_SWITCH_FALLTHROUGH<a name="line.276"></a>
+<span class="sourceLineNo">277</span> case INCLUDE:<a name="line.277"></a>
+<span class="sourceLineNo">278</span> transformed = filter.transformCell(transformed);<a name="line.278"></a>
<span class="sourceLineNo">279</span> continue;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> switch (filter.filterKeyValue(c)) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> case INCLUDE:<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (rc != ReturnCode.INCLUDE_AND_NEXT_COL) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> rc = ReturnCode.INCLUDE;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> transformed = filter.transformCell(transformed);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> break;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> case INCLUDE_AND_NEXT_COL:<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL;<a name="line.290"></a>
-<span class="sourceLineNo">291</span> transformed = filter.transformCell(transformed);<a name="line.291"></a>
-<span class="sourceLineNo">292</span> // must continue here to evaluate all filters<a name="line.292"></a>
-<span class="sourceLineNo">293</span> break;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> case NEXT_ROW:<a name="line.294"></a>
-<span class="sourceLineNo">295</span> break;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> case SKIP:<a name="line.296"></a>
-<span class="sourceLineNo">297</span> break;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> case NEXT_COL:<a name="line.298"></a>
-<span class="sourceLineNo">299</span> break;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> case SEEK_NEXT_USING_HINT:<a name="line.300"></a>
+<span class="sourceLineNo">280</span> case SEEK_NEXT_USING_HINT:<a name="line.280"></a>
+<span class="sourceLineNo">281</span> seekHintFilter = filter;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return code;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> default:<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return code;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (filter.filterAllRemaining()) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> continue;<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> ReturnCode localRC = filter.filterKeyValue(c);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (localRC != ReturnCode.SEEK_NEXT_USING_HINT) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> seenNonHintReturnCode = true;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> switch (localRC) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> case INCLUDE:<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (rc != ReturnCode.INCLUDE_AND_NEXT_COL) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> rc = ReturnCode.INCLUDE;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> transformed = filter.transformCell(transformed);<a name="line.300"></a>
<span class="sourceLineNo">301</span> break;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> default:<a name="line.302"></a>
-<span class="sourceLineNo">303</span> throw new IllegalStateException("Received code is not valid.");<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> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> // Save the transformed Cell for transform():<a name="line.308"></a>
-<span class="sourceLineNo">309</span> this.transformedCell = transformed;<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> return rc;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> /**<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * Filters that never filter by modifying the returned List of Cells can<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * inherit this implementation that does nothing.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> *<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * {@inheritDoc}<a name="line.318"></a>
-<span class="sourceLineNo">319</span> */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> int listize = filters.size();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> for (int i = 0; i < listize; i++) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> filters.get(i).filterRowCells(cells);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> @Override<a name="line.328"></a>
-<span class="sourceLineNo">329</span> public boolean hasFilterRow() {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> int listize = filters.size();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (int i = 0; i < listize; i++) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (filters.get(i).hasFilterRow()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return true;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return false;<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> @Override<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public boolean filterRow() throws IOException {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> int listize = filters.size();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> for (int i = 0; i < listize; i++) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> Filter filter = filters.get(i);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (filter.filterRow()) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return true;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (!filter.filterRow()) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return false;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return operator == Operator.MUST_PASS_ONE;<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> /**<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * @return The filter serialized using pb<a name="line.358"></a>
-<span class="sourceLineNo">359</span> */<a name="line.359"></a>
-<span class="sourceLineNo">360</span> public byte[] toByteArray() throws IOException {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> FilterProtos.FilterList.Builder builder =<a name="line.361"></a>
-<span class="sourceLineNo">362</span> FilterProtos.FilterList.newBuilder();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.363"></a>
-<span class="sourceLineNo">364</span> int listize = filters.size();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> for (int i = 0; i < listize; i++) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return builder.build().toByteArray();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<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> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @throws DeserializationException<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * @see #toByteArray<a name="line.375"></a>
-<span class="sourceLineNo">376</span> */<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public static FilterList parseFrom(final byte [] pbBytes)<a name="line.377"></a>
-<span class="sourceLineNo">378</span> throws DeserializationException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> FilterProtos.FilterList proto;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> try {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> } catch (InvalidProtocolBufferException e) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> throw new DeserializationException(e);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> List<Filter> rowFilters = new ArrayList<Filter>(proto.getFiltersCount());<a name="line.386"></a>
-<span class="sourceLineNo">387</span> try {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> List<org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter> filtersList =<a name="line.388"></a>
-<span class="sourceLineNo">389</span> proto.getFiltersList();<a name="line.389"></a>
-<span class="sourceLineNo">390</span> int listSize = filtersList.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> for (int i = 0; i < listSize; i++) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> } catch (IOException ioe) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> throw new DeserializationException(ioe);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return new FilterList(Operator.valueOf(proto.getOperator().name()),rowFilters);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @param other<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @return true if and only if the fields of the filter that are serialized<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.403"></a>
-<span class="sourceLineNo">404</span> */<a name="line.404"></a>
-<span class="sourceLineNo">405</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (other == this) return true;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (!(other instanceof FilterList)) return false;<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> FilterList o = (FilterList)other;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return this.getOperator().equals(o.getOperator()) &&<a name="line.410"></a>
-<span class="sourceLineNo">411</span> ((this.getFilters() == o.getFilters())<a name="line.411"></a>
-<span class="sourceLineNo">412</span> || this.getFilters().equals(o.getFilters()));<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> @Override<a name="line.415"></a>
-<span class="sourceLineNo">416</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> Cell keyHint = null;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> keyHint = seekHintFilter.getNextCellHint(currentCell);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return keyHint;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // If any condition can pass, we need to keep the min hint<a name="line.423"></a>
-<span class="sourceLineNo">424</span> int listize = filters.size();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> for (int i = 0; i < listize; i++) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Cell curKeyHint = filters.get(i).getNextCellHint(currentCell);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (curKeyHint == null) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> // If we ever don't have a hint and this is must-pass-one, then no hint<a name="line.428"></a>
-<span class="sourceLineNo">429</span> return null;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> if (curKeyHint != null) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> // If this is the first hint we find, set it<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (keyHint == null) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> keyHint = curKeyHint;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> continue;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (CellComparator.COMPARATOR.compare(keyHint, curKeyHint) > 0) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> keyHint = curKeyHint;<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">302</span> case INCLUDE_AND_NEXT_COL:<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rc = ReturnCode.INCLUDE_AND_NEXT_COL;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> transformed = filter.transformCell(transformed);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // must continue here to evaluate all filters<a name="line.305"></a>
+<span class="sourceLineNo">306</span> break;<a name="line.306"></a>
+<span class="sourceLineNo">307</span> case NEXT_ROW:<a name="line.307"></a>
+<span class="sourceLineNo">308</span> break;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> case SKIP:<a name="line.309"></a>
+<span class="sourceLineNo">310</span> break;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> case NEXT_COL:<a name="line.311"></a>
+<span class="sourceLineNo">312</span> break;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> case SEEK_NEXT_USING_HINT:<a name="line.313"></a>
+<span class="sourceLineNo">314</span> break;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> default:<a name="line.315"></a>
+<span class="sourceLineNo">316</span> throw new IllegalStateException("Received code is not valid.");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<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> // Save the transformed Cell for transform():<a name="line.321"></a>
+<span class="sourceLineNo">322</span> this.transformedCell = transformed;<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> /*<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * The seenNonHintReturnCode flag is intended only for Operator.MUST_PASS_ONE branch.<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * If we have seen non SEEK_NEXT_USING_HINT ReturnCode, respect that ReturnCode.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> */<a name="line.327"></a>
+<span class="sourceLineNo">328</span> if (operator == Operator.MUST_PASS_ONE && !seenNonHintReturnCode) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span> return rc;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> /**<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * Filters that never filter by modifying the returned List of Cells can<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * inherit this implementation that does nothing.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> *<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * {@inheritDoc}<a name="line.338"></a>
+<span class="sourceLineNo">339</span> */<a name="line.339"></a>
+<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> int listize = filters.size();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> for (int i = 0; i < listize; i++) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> filters.get(i).filterRowCells(cells);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span> public boolean hasFilterRow() {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> int listize = filters.size();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> for (int i = 0; i < listize; i++) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> if (filters.get(i).hasFilterRow()) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> return true;<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> return false;<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> @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span> public boolean filterRow() throws IOException {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> int listize = filters.size();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (int i = 0; i < listize; i++) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> Filter filter = filters.get(i);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> if (filter.filterRow()) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> return true;<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span> } else if (operator == Operator.MUST_PASS_ONE) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (!filter.filterRow()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return false;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span> return operator == Operator.MUST_PASS_ONE;<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @return The filter serialized using pb<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public byte[] toByteArray() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> FilterProtos.FilterList.Builder builder =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> FilterProtos.FilterList.newBuilder();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.383"></a>
+<span class="sourceLineNo">384</span> int listize = filters.size();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (int i = 0; i < listize; i++) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span> return builder.build().toByteArray();<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> /**<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.393"></a>
+<span class="sourceLineNo">394</span> * @throws DeserializationException<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * @see #toByteArray<a name="line.395"></a>
+<span class="sourceLineNo">396</span> */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public static FilterList parseFrom(final byte [] pbBytes)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> throws DeserializationException {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> FilterProtos.FilterList proto;<a name="line.399"></a>
+<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> } catch (InvalidProtocolBufferException e) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw new DeserializationException(e);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> List<Filter> rowFilters = new ArrayList<Filter>(proto.getFiltersCount());<a name="line.406"></a>
+<span class="sourceLineNo">407</span> try {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> List<org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter> filtersList =<a name="line.408"></a>
+<span class="sourceLineNo">409</span> proto.getFiltersList();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> int listSize = filtersList.size();<a name="line.410"></a>
+<span class="sourceLineNo">411</span> for (int i = 0; i < listSize; i++) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<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> return new FilterList(Operator.valueOf(proto.getOperator().name()),rowFilters);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @param other<a name="line.421"></a>
+<span class="sourceLineNo">422</span> * @return true if and only if the fields of the filter that are serialized<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> */<a name="line.424"></a>
+<span class="sourceLineNo">425</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (other == this) return true;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> if (!(other instanceof FilterList)) return false;<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span> FilterList o = (FilterList)other;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> return this.getOperator().equals(o.getOperator()) &&<a name="line.430"></a>
+<span class="sourceLineNo">431</span> ((this.getFilters() == o.getFilters())<a name="line.431"></a>
+<span class="sourceLineNo">432</span> || this.getFilters().equals(o.getFilters()));<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span> @Override<a name="line.435"></a>
+<span class="sourceLineNo">436</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> Cell keyHint = null;<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (operator == Operator.MUST_PASS_ALL) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> keyHint = seekHintFilter.getNextCellHint(currentCell);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> return keyHint;<a name="line.440"></a>
<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return keyHint;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> @Override<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> int listize = filters.size();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> for (int i = 0; i < listize; i++) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (filters.get(i).isFamilyEssential(name)) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return true;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> return false;<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 void setReversed(boolean reversed) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> int listize = filters.size();<a name="line.458"></a>
-<span class="sourceLineNo">459</span> for (int i = 0; i < listize; i++) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> filters.get(i).setReversed(reversed);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> this.reversed = reversed;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override<a name="line.465"></a>
-<span class="sourceLineNo">466</span> public String toString() {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> return toString(MAX_LOG_FILTERS);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> protected String toString(int maxFilters) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> int endIndex = this.filters.size() < maxFilters<a name="line.471"></a>
-<span class="sourceLineNo">472</span> ? this.filters.size() : maxFilters;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> return String.format("%s %s (%d/%d): %s",<a name="line.473"></a>
-<span class="sourceLineNo">474</span> this.getClass().getSimpleName(),<a name="line.474"></a>
-<span class="sourceLineNo">475</span> this.operator == Operator.MUST_PASS_ALL ? "AND" : "OR",<a name="line.475"></a>
-<span class="sourceLineNo">476</span> endIndex,<a name="line.476"></a>
-<span class="sourceLineNo">477</span> this.filters.size(),<a name="line.477"></a>
-<span class="sourceLineNo">478</span> this.filters.subList(0, endIndex).toString());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>}<a name="line.480"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> // If any condition can pass, we need to keep the min hint<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int listize = filters.size();<a name="line.444"></a>
+<span class="sourceLineNo">445</span> for (int i = 0; i < listize; i++) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> if (filters.get(i).filterAllRemaining()) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> continue;<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span> Cell curKeyHint = filters.get(i).getNextCellHint(currentCell);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (curKeyHint == null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // If we ever don't have a hint and this is must-pass-one, then no hint<a name="line.451"></a>
+<span class="sourceLineNo">452</span> return null;<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (curKeyHint != null) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // If this is the first hint we find, set it<a name="line.455"></a>
+<span class="sourceLineNo">456</span> if (keyHint == null) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> keyHint = curKeyHint;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> continue;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (CellComparator.COMPARATOR.compare(keyHint, curKeyHint) > 0) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> keyHint = curKeyHint;<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>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span> return keyHint;<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> @Override<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> int listize = filters.size();<a name="line.470"></a>
+<span class="sourceLineNo">471</span> for (int i = 0; i < listize; i++) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> if (filters.get(i).isFamilyEssential(name)) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> return true;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return false;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> @Override<a name="line.479"></a>
+<span class="sourceLineNo">480</span> public void setReversed(boolean reversed) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> int listize = filters.size();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> for (int i = 0; i < listize; i++) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> filters.get(i).setReversed(reversed);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> }<a name="line.484"></a>
+<span class="sourceLineNo">485</span> this.reversed = reversed;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> @Override<a name="line.488"></a>
+<span class="sourceLineNo">489</span> public String toString() {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> return toString(MAX_LOG_FILTERS);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span> protected String toString(int maxFilters) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> int endIndex = this.filters.size() < maxFilters<a name="line.494"></a>
+<span class="sourceLineNo">495</span> ? this.filters.size() : maxFilters;<a name="line.495"></a>
+<span class="sourceLineNo">496</span> return String.format("%s %s (%d/%d): %s",<a name="line.496"></a>
+<span class="sourceLineNo">497</span> this.getClass().getSimpleName(),<a name="line.497"></a>
+<span class="sourceLineNo">498</span> this.operator == Operator.MUST_PASS_ALL ? "AND" : "OR",<a name="line.498"></a>
+<span class="sourceLineNo">499</span> endIndex,<a name="line.499"></a>
+<span class="sourceLineNo">500</span> this.filters.size(),<a name="line.500"></a>
+<span class="sourceLineNo">501</span> this.filters.subList(0, endIndex).toString());<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span>}<a name="line.503"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/58f51408/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index d91c62f..c4fa86a 100644
--- a/book.html
+++ b/book.html
@@ -33211,7 +33211,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 2.0.0-SNAPSHOT<br>
-Last updated 2016-03-07 14:49:00 UTC
+Last updated 2016-03-08 14:52:14 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/58f51408/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 5948cda..c4c329b 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160307" />
+ <meta name="Date-Revision-yyyymmdd" content="20160308" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -305,7 +305,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-03-07</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-03-08</li>
</p>
</div>