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

HBASE-8809 Include deletes in the scan (setRaw) method does not respect the time range or the filter 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1498531 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2013-07-01 15:55:20 +00:00
parent ed97685c75
commit a7655cccf2
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
View File

@ -323,7 +323,11 @@ public class ScanQueryMatcher {
|| kv.getMemstoreTS() > maxReadPointToTrackVersions) {
// always include or it is not time yet to check whether it is OK
// to purge deltes or not
return MatchCode.INCLUDE;
if (!isUserScan) {
// if this is not a user scan (compaction), we can filter this deletemarker right here
// otherwise (i.e. a "raw" scan) we fall through to normal version and timerange checking
return MatchCode.INCLUDE;
}
} else if (keepDeletedCells) {
if (timestamp < earliestPutTs) {
// keeping delete rows, but there are no puts older than

43
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
View File

@ -318,12 +318,55 @@ public class TestKeepDeletes extends HBaseTestCase {
InternalScanner scan = region.getScanner(s);
List<KeyValue> kvs = new ArrayList<KeyValue>();
scan.next(kvs);
assertEquals(8, kvs.size());
assertTrue(kvs.get(0).isDeleteFamily());
assertEquals(kvs.get(1).getValue(), T3);
assertTrue(kvs.get(2).isDelete());
assertTrue(kvs.get(3).isDeleteType());
assertEquals(kvs.get(4).getValue(), T2);
assertEquals(kvs.get(5).getValue(), T1);
// we have 3 CFs, so there are two more delete markers
assertTrue(kvs.get(6).isDeleteFamily());
assertTrue(kvs.get(7).isDeleteFamily());
// verify that raw scans honor the passed timerange
s = new Scan();
s.setRaw(true);
s.setMaxVersions();
s.setTimeRange(0, 1);
scan = region.getScanner(s);
kvs = new ArrayList<KeyValue>();
scan.next(kvs);
// nothing in this interval, not even delete markers
assertTrue(kvs.isEmpty());
// filter new delete markers
s = new Scan();
s.setRaw(true);
s.setMaxVersions();
s.setTimeRange(0, ts+2);
scan = region.getScanner(s);
kvs = new ArrayList<KeyValue>();
scan.next(kvs);
assertEquals(4, kvs.size());
assertTrue(kvs.get(0).isDeleteFamily());
assertEquals(kvs.get(1).getValue(), T1);
// we have 3 CFs
assertTrue(kvs.get(2).isDeleteFamily());
assertTrue(kvs.get(3).isDeleteFamily());
// filter old delete markers
s = new Scan();
s.setRaw(true);
s.setMaxVersions();
s.setTimeRange(ts+3, ts+5);
scan = region.getScanner(s);
kvs = new ArrayList<KeyValue>();
scan.next(kvs);
assertEquals(2, kvs.size());
assertEquals(kvs.get(0).getValue(), T3);
assertTrue(kvs.get(1).isDelete());
HRegion.closeHRegion(region);
}