Fix for 380 (hincrby removes hash key ttl) (#381)

Author: M1ha-Shvn

fakeredis/commands_mixins/hash_mixin.py

@@ -24,7 +24,7 @@ class HashCommandsMixin:
     def _hset(self, key: CommandItem, *args: bytes) -> int:
         h = key.value
         keys_count = len(h.keys())
-        h.update(dict(zip(*[iter(args)] * 2)))  # type: ignore  # https://stackoverflow.com/a/12739974/1056460
+        h.update(dict(zip(*[iter(args)] * 2)), clear_expiration=True)  # type: ignore  # https://stackoverflow.com/a/12739974/1056460
         created = len(h.keys()) - keys_count
 
         key.updated()
@@ -58,7 +58,7 @@ def hincrby(self, key: CommandItem, field: bytes, amount_bytes: bytes) -> int:
         amount = Int.decode(amount_bytes)
         field_value = Int.decode(key.value.get(field, b"0"), decode_error=msgs.INVALID_HASH_MSG)
         c = field_value + amount
-        key.value[field] = self._encodeint(c)
+        key.value.update({field: self._encodeint(c)}, clear_expiration=False)
         key.updated()
         return c
 
@@ -68,7 +68,7 @@ def hincrbyfloat(self, key: CommandItem, field: bytes, amount: bytes) -> bytes:
         if not math.isfinite(c):
             raise SimpleError(msgs.NONFINITE_MSG)
         encoded = self._encodefloat(c, True)
-        key.value[field] = encoded
+        key.value.update({field: encoded}, clear_expiration=False)
         key.updated()
         return encoded
 

fakeredis/model/_hash.py

@@ -76,10 +76,11 @@ def items(self) -> Iterable[Tuple[bytes, Any]]:
         self._expire_keys()
         return self._values.items()
 
-    def update(self, values: Dict[bytes, Any]) -> None:
+    def update(self, values: Dict[bytes, Any], clear_expiration: bool) -> None:
         self._expire_keys()
-        for k in values.keys():
-            self.clear_key_expireat(k)
+        if clear_expiration:
+            for k in values.keys():
+                self.clear_key_expireat(k)
         self._values.update(values)
 
     def getall(self) -> Dict[bytes, Any]:

test/test_mixins/test_hash_commands.py

@@ -3,12 +3,6 @@
 import redis.client
 
 from test import testtools
-from test.testtools import raw_command
-
-
-@pytest.mark.min_server("7.4")
-def test_hexpire_empty_key(r: redis.Redis):
-    raw_command(r, "hexpire", b"", 2055010579, "fields", 2, b"\x89U\x04", b"6\x86\xf4\xdd")
 
 
 def test_hstrlen_missing(r: redis.Redis):

test/test_mixins/test_hash_expire_commands.py

@@ -339,3 +339,28 @@ def test_hpttl_multiple_fields_mixed_conditions(r: redis.Redis):
 def test_hpttl_nonexistent_key(r: redis.Redis):
     r.delete("redis-key")
     assert r.hpttl("redis-key", "field1", "field2", "field3") == [-2, -2, -2]
+
+
+def test_hincrby_with_hash_key_expiration(r: redis.Redis):
+    r.hincrby("foo", "counter")
+    r.hexpire("foo", 10, "counter")
+    assert r.hincrby("foo", "counter") == 2
+    res = r.httl("foo", "counter")
+    assert isinstance(res, list)
+    assert len(res) == 1
+    assert res[0] >= 0
+
+
+@pytest.mark.min_server("7.4")
+def test_hexpire_empty_key(r: redis.Redis):
+    testtools.raw_command(r, "hexpire", b"", 2055010579, "fields", 2, b"\x89U\x04", b"6\x86\xf4\xdd")
+
+
+def test_hincrbyfloat_with_hash_key_expiration(r: redis.Redis):
+    r.hincrbyfloat("foo", "counter", 1.0)
+    r.hexpire("foo", 10, "counter")
+    assert r.hincrbyfloat("foo", "counter", 2.0) == 3.0
+    res = r.httl("foo", "counter")
+    assert isinstance(res, list)
+    assert len(res) == 1
+    assert res[0] >= 0