Fix crc32 overload

ext/cbloomfilter/cbloomfilter.c

@@ -4,7 +4,6 @@
  */
 
 #include "ruby.h"
-#include "crc32.h"
 
 #if !defined(RSTRING_LEN)
 # define RSTRING_LEN(x) (RSTRING(x)->len)
@@ -82,6 +81,21 @@ int bucket_get(struct BloomFilter *bf, int index) {
     return (c & mask) >> bit_offset;
 }
 
+static unsigned int key2index(VALUE key, int seed, int m) {
+  VALUE res;
+  int index;
+  unsigned int h;
+
+  if (rb_block_given_p())
+    res = rb_yield_values(2, key, INT2FIX(seed));
+  else
+    rb_raise(rb_eArgError, "a block is required");
+
+  h = FIX2UINT(res);
+  index = (int) (h % (unsigned int) m); 
+  return index;
+}
+
 static VALUE bf_s_new(int argc, VALUE *argv, VALUE self) {
     struct BloomFilter *bf;
     VALUE arg1, arg2, arg3, arg4, arg5, obj;
@@ -193,17 +207,11 @@ static VALUE bf_set_bits(VALUE self){
 }
 
 static VALUE bf_insert(VALUE self, VALUE key) {
-    VALUE skey;
     int index, seed;
-    int i, len, m, k, s;
-    char *ckey;
+    int i, m, k, s;
     struct BloomFilter *bf;
     Data_Get_Struct(self, struct BloomFilter, bf);
 
-    skey = rb_obj_as_string(key);
-    ckey = StringValuePtr(skey);
-    len = (int) (RSTRING_LEN(skey)); /* length of the string in bytes */
-
     m = bf->m;
     k = bf->k;
     s = bf->s;
@@ -213,7 +221,7 @@ static VALUE bf_insert(VALUE self, VALUE key) {
         seed = i + s;
 
         /* hash */
-        index = (int) (crc32((unsigned int) (seed), ckey, len) % (unsigned int) (m));
+        index = key2index(key, seed, m);
 
         /*  set a bit at the index */
         bucket_set(bf, index);
@@ -222,6 +230,7 @@ static VALUE bf_insert(VALUE self, VALUE key) {
     return Qnil;
 }
 
+
 static VALUE bf_merge(VALUE self, VALUE other) {
     struct BloomFilter *bf, *target;
     int i;
@@ -279,16 +288,10 @@ static VALUE bf_or(VALUE self, VALUE other) {
 
 static VALUE bf_delete(VALUE self, VALUE key) {
     int index, seed;
-    int i, len, m, k, s;
-    char *ckey;
-    VALUE skey;
+    int i, m, k, s;
     struct BloomFilter *bf;
     Data_Get_Struct(self, struct BloomFilter, bf);
 
-    skey = rb_obj_as_string(key);
-    ckey = StringValuePtr(skey);
-    len = (int) (RSTRING_LEN(skey)); /* length of the string in bytes */
-
     m = bf->m;
     k = bf->k;
     s = bf->s;
@@ -298,7 +301,7 @@ static VALUE bf_delete(VALUE self, VALUE key) {
         seed = i + s;
 
         /* hash */
-        index = (int) (crc32((unsigned int) (seed), ckey, len) % (unsigned int) (m));
+        index = key2index(key, seed, m);
 
         /*  set a bit at the index */
         bucket_unset(bf, index);
@@ -310,8 +313,7 @@ static VALUE bf_delete(VALUE self, VALUE key) {
 
 static VALUE bf_include(int argc, VALUE* argv, VALUE self) {
     int index, seed;
-    int i, len, m, k, s, tests_idx, vlen;
-    char *ckey;
+    int i, m, k, s, tests_idx, vlen;
     VALUE tests, key, skey;
     struct BloomFilter *bf;
 
@@ -321,9 +323,6 @@ static VALUE bf_include(int argc, VALUE* argv, VALUE self) {
     vlen = RARRAY_LEN(tests);
     for(tests_idx = 0; tests_idx < vlen; tests_idx++) {
       key = rb_ary_entry(tests, tests_idx);
-      skey = rb_obj_as_string(key);
-      ckey = StringValuePtr(skey);
-      len = (int) (RSTRING_LEN(skey)); /* length of the string in bytes */
 
       m = bf->m;
       k = bf->k;
@@ -334,7 +333,7 @@ static VALUE bf_include(int argc, VALUE* argv, VALUE self) {
           seed = i + s;
 
           /* hash */
-          index = (int) (crc32((unsigned int) (seed), ckey, len) % (unsigned int) (m));
+          index = key2index(key, seed, m);
 
           /* check the bit at the index */
           if (!bucket_check(bf, index)) {

lib/bloomfilter/native.rb

@@ -1,3 +1,5 @@
+require 'zlib'
+
 module BloomFilter
   BloomFilter::ConfigurationMismatch = Class.new(ArgumentError)
 
@@ -22,18 +24,31 @@ def initialize(opts = {})
       @bf = CBloomFilter.new(@opts[:size], @opts[:hashes], @opts[:seed], @opts[:bucket], @opts[:raise])
     end
 
+    def key2index(key, seed)
+      Zlib.crc32(key.to_s, seed)
+    end
+
     def insert(key)
-      @bf.insert(key)
+      @bf.insert(key) do |key, seed|
+        key2index(key, seed)
+      end
     end
     alias :[]= :insert
 
     def include?(*keys)
-      @bf.include?(*keys)
+      @bf.include?(*keys) do |key, seed|
+        key2index(key, seed)
+      end
     end
     alias :key? :include?
     alias :[] :include?
 
-    def delete(key); @bf.delete(key); end
+    def delete(key) 
+      @bf.delete(key) do |key, seed|
+        key2index(key, seed)
+      end
+    end
+
     def clear; @bf.clear; end
     def size; @bf.set_bits; end
     def merge!(o); @bf.merge!(o.bf); end

lib/bloomfilter/version.rb

@@ -1,3 +1,3 @@
 module BloomFilter
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end