You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/01/20 00:56:57 UTC

svn commit: r735880 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/onelab/filter/HashFunction.java src/test/org/onelab/test/TestFilter.java

Author: stack
Date: Mon Jan 19 15:56:57 2009
New Revision: 735880

URL: http://svn.apache.org/viewvc?rev=735880&view=rev
Log:
HBASE-1136  HashFunction inadvertently destroys some randomness; REVERTING

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/onelab/filter/HashFunction.java
    hadoop/hbase/trunk/src/test/org/onelab/test/TestFilter.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=735880&r1=735879&r2=735880&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Jan 19 15:56:57 2009
@@ -3,8 +3,6 @@
   INCOMPATIBLE CHANGES
 
   BUG FIXES
-   HBASE-1136  HashFunction inadvertently destroys some randomness
-               (Jonathan Ellis via Stack) 
    HBASE-1140  "ant clean test" fails (Nitay Joffe via Stack)
 
   IMPROVEMENTS

Modified: hadoop/hbase/trunk/src/java/org/onelab/filter/HashFunction.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/onelab/filter/HashFunction.java?rev=735880&r1=735879&r2=735880&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/onelab/filter/HashFunction.java (original)
+++ hadoop/hbase/trunk/src/java/org/onelab/filter/HashFunction.java Mon Jan 19 15:56:57 2009
@@ -118,8 +118,7 @@
       }
       int[] result = new int[nbHash];
       for (int i = 0, initval = 0; i < nbHash; i++) {
-	  initval = hashFunction.hash(b, initval);
-	  result[i] = Math.abs(initval) % maxValue;
+        initval = result[i] = Math.abs(hashFunction.hash(b, initval) % maxValue);
       }
       return result;
   }//end hash() 

Modified: hadoop/hbase/trunk/src/test/org/onelab/test/TestFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/onelab/test/TestFilter.java?rev=735880&r1=735879&r2=735880&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/onelab/test/TestFilter.java (original)
+++ hadoop/hbase/trunk/src/test/org/onelab/test/TestFilter.java Mon Jan 19 15:56:57 2009
@@ -274,7 +274,7 @@
     bf.add(k2);
     bf.add(k3);
     assertTrue(bf.membershipTest(key));
-    assertFalse(bf.membershipTest(k2));
+    assertTrue(bf.membershipTest(new StringKey("graknyl")));
     assertFalse(bf.membershipTest(new StringKey("xyzzy")));
     assertFalse(bf.membershipTest(new StringKey("abcd")));
 
@@ -287,7 +287,7 @@
     bf2.add(key);
     bf.or(bf2);
     assertTrue(bf.membershipTest(key));
-    assertTrue(bf.membershipTest(k2));
+    assertTrue(bf.membershipTest(new StringKey("graknyl")));
     assertFalse(bf.membershipTest(new StringKey("xyzzy")));
     assertFalse(bf.membershipTest(new StringKey("abcd")));