svn commit: r1418036 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java

[li...@apache.org]

Author: liyin
Date: Thu Dec  6 19:19:19 2012
New Revision: 1418036

URL: http://svn.apache.org/viewvc?rev=1418036&view=rev
Log:
[HBASE-2376] Fix TestFlashBackQuery

Author: pritam

Summary:
The unit test did not handle TTL correctly and was adding kvs
that were expired to the set of expected KVs.

Test Plan: Ran the test 100 times on mrunit without failures.

Reviewers: liyintang

Reviewed By: liyintang

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D649950

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java?rev=1418036&r1=1418035&r2=1418036&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java Thu Dec  6 19:19:19 2012
@@ -165,7 +165,8 @@ public class TestFlashBackQuery extends 
       int size, long effectiveTS) {
     boolean isDelete = random.nextBoolean();
     KeyValue kv = getRandomKv(row, hcd, start, size, isDelete);
-    if (kv.getTimestamp() <= effectiveTS) {
+    if (kv.getTimestamp() <= effectiveTS &&
+        kv.getTimestamp() >= effectiveTS - (hcd.getTimeToLive() * 1000)) {
       processHeapKvs(heapKvs, row, hcd, kv);
     }
     return kv;