HBASE-1568 Client doesnt consult old row filter interface in filterSaysStop() - could result in NPE or excessive scanning
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@787742 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
fdf64a3988
commit
fe66233cfa
|
@ -216,6 +216,8 @@ Release 0.20.0 - Unreleased
|
||||||
that into 'now'
|
that into 'now'
|
||||||
HBASE-1508 Shell "close_region" reveals a Master<>HRS problem, regions are
|
HBASE-1508 Shell "close_region" reveals a Master<>HRS problem, regions are
|
||||||
not reassigned
|
not reassigned
|
||||||
|
HBASE-1568 Client doesnt consult old row filter interface in
|
||||||
|
filterSaysStop() - could result in NPE or excessive scanning
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
|
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
|
||||||
|
|
|
@ -1866,9 +1866,16 @@ public class HTable {
|
||||||
if(!scan.hasFilter()) {
|
if(!scan.hasFilter()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Let the filter see current row.
|
if (scan.getFilter() != null) {
|
||||||
scan.getFilter().filterRowKey(endKey, 0, endKey.length);
|
// Let the filter see current row.
|
||||||
return scan.getFilter().filterAllRemaining();
|
scan.getFilter().filterRowKey(endKey, 0, endKey.length);
|
||||||
|
return scan.getFilter().filterAllRemaining();
|
||||||
|
}
|
||||||
|
if (scan.getOldFilter() != null) {
|
||||||
|
scan.getOldFilter().filterRowKey(endKey, 0, endKey.length);
|
||||||
|
return scan.getOldFilter().filterAllRemaining();
|
||||||
|
}
|
||||||
|
return false; //unlikely.
|
||||||
}
|
}
|
||||||
|
|
||||||
public Result next() throws IOException {
|
public Result next() throws IOException {
|
||||||
|
|
Loading…
Reference in New Issue