mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-22 15:57:15 +00:00
Code Issues Releases Wiki Activity

adapt to borghash recent api cleanup

Browse source
This commit is contained in:
Thomas Waldmann 2024-10-26 19:25:14 +02:00
parent 9775adf52b
commit fb22e76573
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/borg/hashindex.pyx
View file

@ -24,7 +24,7 @@ class ChunkIndex:
else: else:
if usable is not None: if usable is not None:
capacity = usable * 2 # load factor 0.5 capacity = usable * 2 # load factor 0.5
self.ht = HashTableNT(key_size=32, value_format="<II", namedtuple_type=ChunkIndexEntry, capacity=capacity) self.ht = HashTableNT(key_size=32, value_format="<II", value_type=ChunkIndexEntry, capacity=capacity)
def __setitem__(self, key, value): def __setitem__(self, key, value):
if not isinstance(value, ChunkIndexEntry) and isinstance(value, tuple): if not isinstance(value, ChunkIndexEntry) and isinstance(value, tuple):
@ -44,7 +44,7 @@ class ChunkIndex:
return len(self.ht) return len(self.ht)
def iteritems(self): def iteritems(self):
yield from self.ht.iteritems() yield from self.ht.items()
def get(self, key, default=None): def get(self, key, default=None):
return self.ht.get(key, default) return self.ht.get(key, default)
@ -76,7 +76,7 @@ class FuseVersionsIndex:
Mapping from key128 to (file_version32, file_content_hash128) to support the FUSE versions view. Mapping from key128 to (file_version32, file_content_hash128) to support the FUSE versions view.
""" """
def __init__(self): def __init__(self):
self.ht = HashTableNT(key_size=16, value_format="<I16s", namedtuple_type=FuseVersionsIndexEntry) self.ht = HashTableNT(key_size=16, value_format="<I16s", value_type=FuseVersionsIndexEntry)
def __setitem__(self, key, value): def __setitem__(self, key, value):
self.ht[key] = value self.ht[key] = value
@ -114,7 +114,7 @@ class NSIndex1:
def __init__(self, capacity=1000, path=None, permit_compact=False, usable=None): def __init__(self, capacity=1000, path=None, permit_compact=False, usable=None):
if usable is not None: if usable is not None:
capacity = usable * 2 # load factor 0.5 capacity = usable * 2 # load factor 0.5
self.ht = HashTableNT(key_size=self.KEY_SIZE, value_format=self.VALUE_FMT, namedtuple_type=NSIndex1Entry, capacity=capacity) self.ht = HashTableNT(key_size=self.KEY_SIZE, value_format=self.VALUE_FMT, value_type=NSIndex1Entry, capacity=capacity)
if path: if path:
self._read(path) self._read(path)
@ -146,7 +146,7 @@ class NSIndex1:
def iteritems(self, marker=None): def iteritems(self, marker=None):
do_yield = marker is None do_yield = marker is None
for key, value in self.ht.iteritems(): for key, value in self.ht.items():
if do_yield: if do_yield:
yield key, value yield key, value
else: else:
@ -181,7 +181,7 @@ class NSIndex1:
header_bytes = struct.pack(self.HEADER_FMT, self.MAGIC, used, used, self.KEY_SIZE, self.VALUE_SIZE) header_bytes = struct.pack(self.HEADER_FMT, self.MAGIC, used, used, self.KEY_SIZE, self.VALUE_SIZE)
fd.write(header_bytes) fd.write(header_bytes)
count = 0 count = 0
for key, _ in self.ht.iteritems(): for key, _ in self.ht.items():
value = self.ht._get_raw(key) value = self.ht._get_raw(key)
fd.write(key) fd.write(key)
fd.write(value) fd.write(value)