Index: src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java (revision 1297159) +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java (working copy) @@ -447,16 +447,16 @@ p.add(c1, c1, T2); region.put(p); - Delete d = new Delete(T1, ts+1, null); - d.deleteColumns(c0, c0, ts+1); + Delete d = new Delete(T1, ts+2, null); + d.deleteColumns(c0, c0, ts+2); region.delete(d, null, true); - d = new Delete(T1, ts+1, null); - d.deleteFamily(c1, ts+1); + d = new Delete(T1, ts+2, null); + d.deleteFamily(c1, ts+2); region.delete(d, null, true); - d = new Delete(T2, ts+1, null); - d.deleteFamily(c0, ts+1); + d = new Delete(T2, ts+2, null); + d.deleteFamily(c0, ts+2); region.delete(d, null, true); // add an older delete, to make sure it is filtered @@ -464,7 +464,7 @@ d.deleteFamily(c1, ts-10); region.delete(d, null, true); - // ts + 2 does NOT include the delete at ts+1 + // ts + 2 does NOT include the delete at ts+2 checkGet(region, T1, c0, c0, ts+2, T2, T1); checkGet(region, T1, c0, c1, ts+2, T2, T1); checkGet(region, T1, c1, c0, ts+2, T2, T1); @@ -610,10 +610,10 @@ region.put(p); // family markers are each family - Delete d = new Delete(T1, ts, null); + Delete d = new Delete(T1, ts+1, null); region.delete(d, null, true); - d = new Delete(T2, ts+1, null); + d = new Delete(T2, ts+2, null); region.delete(d, null, true); Scan s = new Scan(T1); Index: src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (revision 1297159) +++ src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (working copy) @@ -178,7 +178,7 @@ p.add(FAMILY, C0, T3); h.put(p); - Delete d = new Delete(T1, ts+2, null); + Delete d = new Delete(T1, ts+3, null); h.delete(d); d = new Delete(T1, ts+3, null); Index: src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java (revision 1297159) +++ src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java (working copy) @@ -281,8 +281,7 @@ // first ignore delete markers if the scanner can do so, and the // range does not include the marker boolean includeDeleteMarker = seePastDeleteMarkers ? - // +1, to allow a range between a delete and put of same TS - tr.withinTimeRange(timestamp+1) : + tr.withinTimeRange(timestamp) : tr.withinOrAfterTimeRange(timestamp); if (includeDeleteMarker) { this.deletes.add(bytes, offset, qualLength, timestamp, type);