Parcourir la source

[datastructures] Fix LimitedSet.discard()

This was raising ValueError every time it was called, because the
argument order was backward, resulting in unbounded memory growth for
callers using discard() to remove items from LimitedSet.

Closes #3087
Dave Smith il y a 9 ans
Parent
commit
214e142e91
2 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 1 1
      celery/datastructures.py
  2. 2 0
      celery/tests/utils/test_datastructures.py

+ 1 - 1
celery/datastructures.py

@@ -602,7 +602,7 @@ class LimitedSet(object):
         except KeyError:
             return
         try:
-            self._heap.remove((value, itime))
+            self._heap.remove((itime, value))
         except ValueError:
             pass
         self._data.pop(value, None)

+ 2 - 0
celery/tests/utils/test_datastructures.py

@@ -255,6 +255,8 @@ class test_LimitedSet(Case):
         s.add('foo')
         s.discard('foo')
         self.assertNotIn('foo', s)
+        self.assertEqual(len(s._data), 0)
+        self.assertEqual(len(s._heap), 0)
         s.discard('foo')
 
     def test_clear(self):