fix:cf.count

Author: cunla

fakeredis/stack/_cf_mixin.py

@@ -47,7 +47,7 @@ def _cf_add(key: CommandItem, item: bytes) -> int:
 
     @staticmethod
     def _cf_exist(key: CommandItem, item: bytes) -> int:
-        return 1 if (item in key.value) else 0
+        return 1 if (key.value is not None and item in key.value) else 0
 
     @command(name="CF.ADD", fixed=(Key(ScalableCuckooFilter), bytes), repeat=(), flags=msgs.FLAG_DO_NOT_CREATE)
     def cf_add(self, key: CommandItem, value: bytes) -> int:
@@ -61,7 +61,11 @@ def cf_addnx(self, key: CommandItem, value: bytes) -> int:
 
     @command(name="CF.COUNT", fixed=(Key(ScalableCuckooFilter), bytes), repeat=(), flags=msgs.FLAG_DO_NOT_CREATE)
     def cf_count(self, key: CommandItem, item: bytes) -> int:
-        return 1 if self._cf_exist(key, item) else 0  # todo
+        if key.value is None:
+            return 0
+        if type(key.value) is not ScalableCuckooFilter:
+            raise SimpleError(msgs.WRONGTYPE_MSG)
+        return key.value.count(item)
 
     @command(name="CF.DEL", fixed=(Key(ScalableCuckooFilter), bytes), repeat=(), flags=msgs.FLAG_DO_NOT_CREATE)
     def cf_del(self, key: CommandItem, value: bytes) -> int:

test/test_stack/test_cuckoofilter.py

@@ -7,7 +7,7 @@
 
 
 @pytest.mark.min_server("7")
-@pytest.mark.unsupported_server_types("dragonfly")
+@pytest.mark.unsupported_server_types("dragonfly", "valkey")
 def test_cf_add_and_insert(r: redis.Redis):
     assert r.cf().create("cuckoo", 1000)
     assert r.cf().add("cuckoo", "filter")
@@ -43,3 +43,12 @@ def test_cf_exists_and_del(r: redis.Redis):
     assert 0 == r.cf().count("cuckoo", "notexist")
     assert r.cf().delete("cuckoo", "filter")
     assert 0 == r.cf().count("cuckoo", "filter")
+
+
+@pytest.mark.unsupported_server_types("dragonfly")
+def test_cf_count_non_existing(r: redis.Redis):
+    assert r.cf().count("cuckoo", "non_existing") == 0
+    assert r.cf().create("cuckoo", 1000)
+    assert r.cf().add("cuckoo", "item1")
+    assert r.cf().insert("cuckoo", ["item1", "item1", "item2"]) == [1, 1, 1]
+    assert r.cf().count("cuckoo", "item1") == 3