redis-allocator 0.4.1__tar.gz → 0.4.3__tar.gz

{redis_allocator-0.4.1/redis_allocator.egg-info → redis_allocator-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redis-allocator
-Version: 0.4.1
+Version: 0.4.3
 Summary: Redis-based resource allocation system.
 Home-page: https://github.com/invoker-bot/RedisAllocator-python
 Author: Invoker Bot

{redis_allocator-0.4.1 → redis_allocator-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.4.1"
+version = "0.4.3"
 tag_format = "v$version"
 
 [tool.commitizen.version_files]

redis_allocator-0.4.3/redis_allocator/_version.py

@@ -0,0 +1 @@
+__version__ = '0.4.3'

{redis_allocator-0.4.1 → redis_allocator-0.4.3}/redis_allocator/allocator.py

@@ -199,6 +199,8 @@ class RedisAllocatorObject(Generic[U]):
             self.key = new_obj.key
             self.params = new_obj.params
             self.open()
+        elif self.obj is not None:
+            logger.error("Failed to refresh the object %s", self.key)
 
     def refresh_until_healthy(self, timeout: Timeout = 120, max_attempts: int = 10, lock_duration: Timeout = 3600, cache_timeout: Timeout = 3600):
         """Refresh the object until it is healthy."""
@@ -226,9 +228,9 @@ class RedisAllocatorObject(Generic[U]):
             return None
         return self.obj.name
 
-    def __del__(self):
-        """Delete the object."""
-        self.close()
+    # def __del__(self):
+    #     """Delete the object."""
+    #     self.close()
 
 
 class RedisAllocatorUpdater:
@@ -632,6 +634,7 @@ class RedisAllocator(RedisLockPool, Generic[U]):
         local tailKey      = pool_pointer_str(false)
         local function push_to_tail(itemName, expiry)  -- push the item to the free list
             local tail = redis.call("GET", tailKey)
+            local head = redis.call("GET", headKey)
             if not tail then
                 tail = ""
             end
@@ -641,11 +644,33 @@ class RedisAllocator(RedisLockPool, Generic[U]):
             else
                 local tailVal = redis.call("HGET", poolItemsKey, tail)
                 local prev, next, expiry = split_pool_value(tailVal)
-                assert(next == "", "tail is not the last item in the free list")
+                assert(next == "" or next == '#ALLOCATED', "tail is not the last item in the free list")
                 redis.call("HSET", poolItemsKey, tail, join_pool_value(prev, itemName, expiry))
             end
             redis.call("SET", tailKey, itemName)  -- set the tail point to the new item
         end
+        -- Ensure the new head node is well-formed (prev="") and update tail/head
+        local function set_item_head_nil(nextItemName)
+            if nextItemName == "" then
+                -- list becomes empty
+                redis.call("SET", headKey, "")
+                redis.call("SET", tailKey, "")
+                return
+            end
+
+            local nextVal = redis.call("HGET", poolItemsKey, nextItemName)
+            if not nextVal then
+                -- corrupted pointer, clear list
+                redis.call("SET", headKey, "")
+                redis.call("SET", tailKey, "")
+                return
+            end
+
+            local _prev, nextNext, nextExpiry = split_pool_value(nextVal)
+            if _prev ~= "" then
+                redis.call("HSET", poolItemsKey, nextItemName, join_pool_value("", nextNext, nextExpiry))
+            end
+        end
         local function pop_from_head()  -- pop the item from the free list
             local head = redis.call("GET", headKey)
             if not head or head == "" then  -- the free list is empty
@@ -658,29 +683,33 @@ class RedisAllocator(RedisLockPool, Generic[U]):
             if is_expiry_invalid(headExpiry) then  -- the item has expired
                 redis.call("HDEL", poolItemsKey, head)
                 redis.call("SET", headKey, headNext)
+                set_item_head_nil(headNext)
                 return pop_from_head()
-            end
-            if redis.call("EXISTS", key_str(head)) > 0 then  -- the item is locked
+            elseif redis.call("EXISTS", key_str(head)) > 0 then  -- the item is locked
                 redis.call("HSET", poolItemsKey, head, join_pool_value("#ALLOCATED", "#ALLOCATED", headExpiry))
                 redis.call("SET", headKey, headNext)
+                set_item_head_nil(headNext)
                 return pop_from_head()
-            end
-            local prev, next, expiry = split_pool_value(headVal)
-            if next == "" then  -- the item is the last in the free list
+            elseif headNext == "" then  -- the item is the last in the free list
                 redis.call("SET", headKey, "")
                 redis.call("SET", tailKey, "")
             else
-                local nextVal = redis.call("HGET", poolItemsKey, next)
+                local nextVal = redis.call("HGET", poolItemsKey, headNext)
                 local nextPrev, nextNext, nextExpiry = split_pool_value(nextVal)
-                redis.call("HSET", poolItemsKey, next, join_pool_value("", nextNext, nextExpiry))
-                redis.call("SET", headKey, next)
+                redis.call("HSET", poolItemsKey, headNext, join_pool_value("", nextNext, nextExpiry))
+                redis.call("SET", headKey, headNext)
+            end
+            redis.call("HSET", poolItemsKey, head, join_pool_value("#ALLOCATED", "#ALLOCATED", headExpiry))
+            -- If we removed the current head, update head pointer
+            local savedHead = redis.call("GET", headKey)
+            if savedHead == itemName then
+                redis.call("SET", headKey, next or "")
             end
-            redis.call("HSET", poolItemsKey, head, join_pool_value("#ALLOCATED", "#ALLOCATED", expiry))
             return head, headExpiry
         end
         local function set_item_allocated(itemName, val)
             if not val then
-                val = redis.call("HGET", poolItemsKey, itemName)
+                val = redis.call("HGET", pool_str(), itemName)
             end
             if val then
                 local prev, next, expiry = split_pool_value(val)
@@ -707,6 +736,22 @@ class RedisAllocator(RedisLockPool, Generic[U]):
                         redis.call("SET", tailKey, prev or "")
                     end
                     redis.call("HSET", poolItemsKey, itemName, join_pool_value("#ALLOCATED", "#ALLOCATED", expiry))
+                    -- If we removed the current head, update head pointer
+                    local savedHead = redis.call("GET", headKey)
+                    if savedHead == itemName then
+                        redis.call("SET", headKey, next or "")
+                    end
+                end
+            end
+            -- Invariant fix: ensure current head's prev pointer is always "".
+            local currentHead = redis.call("GET", headKey)
+            if currentHead and currentHead ~= "" then
+                local currentHeadVal = redis.call("HGET", poolItemsKey, currentHead)
+                if currentHeadVal then
+                    local curPrev, curNext, curExpiry = split_pool_value(currentHeadVal)
+                    if curPrev ~= "" then
+                        redis.call("HSET", poolItemsKey, currentHead, join_pool_value("", curNext, curExpiry))
+                    end
                 end
             end
         end
@@ -717,8 +762,9 @@ class RedisAllocator(RedisLockPool, Generic[U]):
             assert(value, "value should not be nil")
             local prev, next, expiry = split_pool_value(value)
             if is_expiry_invalid(expiry) then  -- Check if the item has expired
-                set_item_allocated(itemName)
+                set_item_allocated(itemName, value)
                 redis.call("HDEL", poolItemsKey, itemName)
+                return
             end
             local locked = redis.call("EXISTS", key_str(itemName)) > 0
             if prev == "#ALLOCATED" then
@@ -727,7 +773,7 @@ class RedisAllocator(RedisLockPool, Generic[U]):
                 end
             else
                 if locked then
-                    set_item_allocated(itemName)
+                    set_item_allocated(itemName, value)
                 end
             end
         end

{redis_allocator-0.4.1 → redis_allocator-0.4.3/redis_allocator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redis-allocator
-Version: 0.4.1
+Version: 0.4.3
 Summary: Redis-based resource allocation system.
 Home-page: https://github.com/invoker-bot/RedisAllocator-python
 Author: Invoker Bot

{redis_allocator-0.4.1 → redis_allocator-0.4.3}/tests/test_allocator.py

@@ -214,13 +214,8 @@ class TestRedisAllocatorObject:
         obj.close()
         assert test_object.closed
         obj.close()  # Should not raise
-
-    def test_del(self, redis_allocator: RedisAllocator, test_object: _TestObject, mocker: MockFixture):
-        """Test the __del__ method."""
-        obj = RedisAllocatorObject(redis_allocator, "test_key", test_object, {})
-        obj.close = mocker.MagicMock()
-        obj.__del__()
-        obj.close.assert_called_once()
+        obj.refresh()
+        assert not test_object.closed
 
 
 class TestRedisAllocator:

redis_allocator-0.4.1/redis_allocator/_version.py

@@ -1 +0,0 @@
-__version__ = '0.4.1'