Merge pull request #28 from borgbackup/update-method

HashTableNT: add update method

Author: ThomasWaldmann

src/borghash/HashTableNT.pyx

@@ -2,6 +2,8 @@
 HashTableNT: wrapper around HashTable, providing namedtuple values and serialization.
 """
 from __future__ import annotations
+
+from collections.abc import Mapping
 from typing import BinaryIO, Iterator, Any
 
 from collections import namedtuple
@@ -111,6 +113,23 @@ cdef class HashTableNT:
         else:
             return self._to_namedtuple_value(binary_value)
 
+    def update(self, other=(), /, **kwds):
+        """Like dict.update, but other can also be a HashTableNT instance."""
+        if isinstance(other, HashTableNT):
+            for key, value in other.items():
+                self[key] = value
+        elif isinstance(other, Mapping):
+            for key in other:
+                self[key] = other[key]
+        elif hasattr(other, "keys"):
+            for key in other.keys():
+                self[key] = other[key]
+        else:
+            for key, value in other:
+                self[key] = value
+        for key, value in kwds.items():
+            self[key] = value
+
     def k_to_idx(self, key: bytes) -> int:
         return self.inner.k_to_idx(key)
 

tests/hashtablent_test.py

@@ -14,6 +14,7 @@
 key1, value1 = b"a" * 32, value_type(11, 12, 13)
 key2, value2 = b"b" * 32, value_type(21, 22, 23)
 key3, value3 = b"c" * 32, value_type(31, 32, 33)
+key4, value4 = b"d" * 32, value_type(41, 42, 43)
 
 
 @pytest.fixture
@@ -91,6 +92,20 @@ def test_pop(ntht12):
     assert ntht12.pop(key3, None) is None
 
 
+def test_update_kvpairs(ntht12):
+    ntht12.update([(key3, value3), (key4, value4)])
+    assert ntht12[key3] == value3
+    assert ntht12[key4] == value4
+
+
+def test_update_ntht(ntht12, ntht):
+    ntht[key3] = value3
+    ntht[key4] = value4
+    ntht12.update(ntht)
+    assert ntht12[key3] == value3
+    assert ntht12[key4] == value4
+
+
 def test_ntht_stress(ntht):
     # this also triggers some hashtable resizing
     keys = set()