Merge pull request #30 from mizvyt/len_fix

Reset Bloom filter length after clear_all (fixes #27)

src/bloomfilter.c

@@ -41,6 +41,7 @@ BloomFilter *bloomfilter_Create_Malloc(size_t max_num_elem, double error_rate,
     return bf;
 }
 
+
 BloomFilter *bloomfilter_Create_Mmap(size_t max_num_elem, double error_rate,
                                 const char * file, BTYPE num_bits, int oflags, int perms,
                                 int *hash_seeds, int num_hashes)
@@ -108,6 +109,7 @@ void bloomfilter_Print(BloomFilter * bf)
            (unsigned long)bf->max_num_elem, bf->error_rate, bf->num_hashes);
 }
 
+
 int bloomfilter_Update(BloomFilter * bf, char * data, int size)
 {
     MBArray * array = bf->array;
@@ -123,6 +125,17 @@ int bloomfilter_Update(BloomFilter * bf, char * data, int size)
 }
 
 
+int bloomfilter_Clear(BloomFilter * bf)
+{
+    int retval = mbarray_ClearAll(bf->array);
+    if (retval) {
+        return retval;
+    }
+    bf->elem_count = 0;
+    return 0;
+}
+
+
 BloomFilter * bloomfilter_Copy_Template(BloomFilter * src, char * filename, int perms)
 {
     BloomFilter * bf = (BloomFilter *)malloc(sizeof(BloomFilter));

src/bloomfilter.h

@@ -36,8 +36,8 @@ BloomFilter *bloomfilter_Create_Mmap(size_t max_num_elem, double error_rate,
                                 int *hash_seeds, int num_hashes);
 
 void bloomfilter_Destroy(BloomFilter * bf);
-
 int bloomfilter_Update(BloomFilter * bf, char * data, int size);
+int bloomfilter_Clear(BloomFilter * bf);
 
 BloomFilter * bloomfilter_Copy_Template(BloomFilter * src, char * filename, int perms);
 

src/cbloomfilter.pxd

@@ -52,4 +52,5 @@ cdef extern from "bloomfilter.h":
      int bloomfilter_Add(BloomFilter * bf, Key * key)
      int bloomfilter_Test(BloomFilter * bf, Key * key)
      int bloomfilter_Update(BloomFilter * bf, char * data, int size)
+     int bloomfilter_Clear(BloomFilter * bf)
      BloomFilter * bloomfilter_Copy_Template(BloomFilter * src, char * filename, int perms)

src/pybloomfilter.pyx

@@ -308,7 +308,7 @@ cdef class BloomFilter:
         """Removes all elements from the Bloom filter at once."""
         self._assert_open()
         self._assert_writable()
-        cbloomfilter.mbarray_ClearAll(self._bf.array)
+        cbloomfilter.bloomfilter_Clear(self._bf)
 
     def __contains__(self, item_):
         """Checks to see if item is contained in the filter, with