Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2447 LogSyncer.addToSyncQueue doesn't check if syncer is still running before waiting -- undo mistaken commit of unrelated stuff 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@937590 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-04-24 04:27:04 +00:00
parent 1982339473
commit 6b626b5e5d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -1866,14 +1866,8 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
}
results.clear();
boolean returnResult = nextInternal(limit);
if (!returnResult && filter != null) {
// final chance to modify row contents
returnResult = filter.filterRow(results);
// final chance to drop the row... This may be superfluous with the addition of the above?
// still needed for backwards compatibility however
if (returnResult || filter.filterRow()) {
results.clear();
}
if (!returnResult && filter != null && filter.filterRow()) {
results.clear();
}
outResults.addAll(results);
resetFilters();