svn commit: r1082655 - in /hbase/branches/0.90: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

[nspiegelberg]

Author: nspiegelberg
Date: Thu Mar 17 19:32:54 2011
New Revision: 1082655

URL: http://svn.apache.org/viewvc?rev=1082655&view=rev
Log:
HBASE-3665 tighten assertions for testBloomFilterSize

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1082655&r1=1082654&r2=1082655&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Mar 17 19:32:54 2011
@@ -28,6 +28,7 @@ Release 0.90.2 - Unreleased
                (Guanpeng Xu via Stack)
    HBASE-3636  a bug about deciding whether this key is a new key for the
                ROWCOL bloomfilter (Liyin Tang via Stack)
+   HBASE-3665  tighten assertions for testBloomFilterSize
    HBASE-3639  FSUtils.getRootDir should qualify path
    HBASE-3648  [replication] failover is sloppy with znodes
    HBASE-3613  NPE in MemStoreFlusher

Modified: 
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1082655&r1=1082654&r2=1082655&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
 (original)
+++ 
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
 Thu Mar 17 19:32:54 2011
@@ -2795,11 +2795,12 @@ public class TestHRegion extends HBaseTe
     int duplicate_multiplier =2;
     int num_storefiles = 4;
 
+    int version = 0;
     for (int f =0 ; f < num_storefiles; f++) {
       for (int i = 0; i < duplicate_multiplier; i ++) {
         for (int j = 0; j < num_unique_rows; j++) {
           Put put = new Put(Bytes.toBytes("row" + j));
-          put.add(fam1, qf1, val1);
+                       put.add(fam1, qf1, version++, val1);
           region.put(put);
         }
       }
@@ -2812,6 +2813,7 @@ public class TestHRegion extends HBaseTe
       StoreFile.Reader reader = storefile.getReader();
       reader.loadFileInfo();
       reader.loadBloomfilter();
+      assertEquals(num_unique_rows*duplicate_multiplier, reader.getEntries());
       assertEquals(num_unique_rows, reader.getFilterEntries());
     }
     
@@ -2823,6 +2825,8 @@ public class TestHRegion extends HBaseTe
       StoreFile.Reader reader = storefile.getReader();
       reader.loadFileInfo();
       reader.loadBloomfilter();
+      assertEquals(num_unique_rows*duplicate_multiplier*num_storefiles,
+          reader.getEntries());
       assertEquals(num_unique_rows, reader.getFilterEntries());
     }  
   }