BUG Fix jug cleanup for redis backend

This was a big bug: the cleanup did not preserve the active tasks at all!

closes #86

ChangeLog

@@ -1,3 +1,6 @@
+Unreleased
+	* Fix `jug cleanup` for redis backend
+
 Version 2.2.0 Tue 3 May 2022 by luispedro
 	* Add `jug pack` subcommand
 	* Remove six dependency

jug/backends/dict_store.py

@@ -1,5 +1,5 @@
 #-*- coding: utf-8 -*-
-# Copyright (C) 2009-2020, Luis Pedro Coelho <luis@luispedro.org>
+# Copyright (C) 2009-2022, Luis Pedro Coelho <luis@luispedro.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -112,7 +112,7 @@ def cleanup(self, active, keeplocks=False):
         existing = set(self.store.keys())
         for act in active:
             try:
-                existing.remove(_resultname(act))
+                existing.remove(_resultname(act.hash()))
             except KeyError:
                 pass
 

jug/backends/redis_store.py

@@ -1,5 +1,5 @@
 #-*- coding: utf-8 -*-
-# Copyright (C) 2009-2020, Luis Pedro Coelho <luis@luispedro.org>
+# Copyright (C) 2009-2022, Luis Pedro Coelho <luis@luispedro.org>
 # vim: set ts=4 sts=4 sw=4 expandtab smartindent:
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -119,24 +119,18 @@ def cleanup(self, active, keeplocks=False):
 
         Implement 'cleanup' command
         '''
-        existing = list(self.list())
-        for act in active:
-            try:
-                existing.remove(_resultname(act.hash()))
-            except ValueError:
-                pass
 
-        if keeplocks:
-            for lock in self.listlocks():
-                try:
-                    existing.remove(_lockname(lock))
-                except ValueError:
-                    pass
+
+        existing = set(self.list())
+        existing -= set(act.hash() for act in active)
 
         cleaned = len(existing)
         for superflous in existing:
             self.redis.delete(_resultname(superflous))
 
+        if not keeplocks:
+            cleaned += self.remove_locks()
+
         return cleaned
 
     def remove_locks(self):

jug/tests/test_store.py

@@ -136,3 +136,31 @@ def test_numpy_array_no_compress(tmpdir):
     assert np.all(arr2 == arr)
     store.remove(key)
     store.close()
+
+class MockHash:
+    def __init__(self, h):
+        self.h = h
+
+    def hash(self):
+        return self.h
+
+def test_cleanup(store):
+    assert len(list(store.listlocks())) == 0
+    key1 = b'jugisbestthingever'
+    key2 = b'jug_key2'
+    ob1 = [1]
+    ob2 = [1, 2]
+    store.dump(ob1, key1)
+    store.dump(ob2, key2)
+
+    assert len(list(store.list())) == 2
+    assert store.cleanup([MockHash(key1), MockHash(key2)]) == 0
+    assert store.cleanup([MockHash(key1), MockHash(key2)], keeplocks=False) == 0
+
+    assert len(list(store.list())) == 2
+    assert store.cleanup([MockHash(key1)]) == 1
+    assert len(list(store.list())) == 1
+    assert store.cleanup([MockHash(key2)]) == 1
+    assert len(list(store.list())) == 0
+
+