upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-10 09:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #9604 from ThomasWaldmann/chunker-fixes

Browse source 
chunker fixes
This commit is contained in:
TW 2026-05-12 18:42:27 +02:00 committed by GitHub
commit d73c11ac77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/borg/chunkers/buzhash.pyx
View file

@ -83,10 +83,12 @@ cdef extern from *:
@cython.boundscheck(False) # Deactivate bounds checking
@cython.wraparound(False) # Deactivate negative indexing.
cdef uint32_t* buzhash_init_table(uint32_t seed):
cdef uint32_t* buzhash_init_table(uint32_t seed) except NULL:
"""Initialize the buzhash table with the given seed."""
cdef int i
cdef uint32_t* table = <uint32_t*>malloc(1024) # 256 * sizeof(uint32_t)
if table == NULL:
raise MemoryError("Failed to allocate buzhash table")
for i in range(256):
table[i] = table_base[i] ^ seed
return table
@ -99,6 +101,8 @@ cdef uint32_t _buzhash(const unsigned char* data, size_t len, const uint32_t* h)
"""Calculate the buzhash of the given data."""
cdef uint32_t i
cdef uint32_t sum = 0, imod
if len == 0:
return 0
for i in range(len - 1, 0, -1):
imod = i & 0x1f
sum ^= BARREL_SHIFT(h[data[0]], imod)
@ -141,6 +145,8 @@ cdef class Chunker:
cdef bint sparse
def __cinit__(self, int seed, int chunk_min_exp, int chunk_max_exp, int hash_mask_bits, int hash_window_size, bint sparse=False):
self.table = NULL
self.data = NULL
min_size = 1 << chunk_min_exp
max_size = 1 << chunk_max_exp
assert max_size <= len(zeros)
@ -153,6 +159,8 @@ cdef class Chunker:
self.table = buzhash_init_table(seed & 0xffffffff)
self.buf_size = max_size
self.data = <uint8_t*>malloc(self.buf_size)
if self.data == NULL:
raise MemoryError("Failed to allocate chunker buffer")
self.fh = -1
self.done = 0
self.eof = 0

10
src/borg/chunkers/buzhash64.pyx
View file

@ -40,7 +40,7 @@ cdef extern from *:
@cython.boundscheck(False) # Deactivate bounds checking
@cython.wraparound(False) # Deactivate negative indexing.
cdef uint64_t* buzhash64_init_table(bytes key):
cdef uint64_t* buzhash64_init_table(bytes key) except NULL:
"""
Generate a balanced pseudo-random table deterministically from a 256-bit key.
Balanced means that for each bit position 0..63, exactly 50% of the table values have the bit set to 1.
@ -50,6 +50,8 @@ cdef uint64_t* buzhash64_init_table(bytes key):
cdef int i, j, bit_pos
cdef uint64_t* table = <uint64_t*>malloc(2048) # 256 * sizeof(uint64_t)
if table == NULL:
raise MemoryError("Failed to allocate buzhash64 table")
# Initialize all values to 0
for i in range(256):
@ -76,6 +78,8 @@ cdef uint64_t _buzhash64(const unsigned char* data, size_t len, const uint64_t*
"""Calculate the buzhash of the given data."""
cdef uint64_t i
cdef uint64_t sum = 0, imod
if len == 0:
return 0
for i in range(len - 1, 0, -1):
imod = i & 0x3f
sum ^= BARREL_SHIFT64(h[data[0]], imod)
@ -118,6 +122,8 @@ cdef class ChunkerBuzHash64:
cdef bint sparse
def __cinit__(self, bytes key, int chunk_min_exp, int chunk_max_exp, int hash_mask_bits, int hash_window_size, bint sparse=False):
self.table = NULL
self.data = NULL
min_size = 1 << chunk_min_exp
max_size = 1 << chunk_max_exp
assert max_size <= len(zeros)
@ -130,6 +136,8 @@ cdef class ChunkerBuzHash64:
self.table = buzhash64_init_table(key)
self.buf_size = max_size
self.data = <uint8_t*>malloc(self.buf_size)
if self.data == NULL:
raise MemoryError("Failed to allocate chunker buffer")
self.fh = -1
self.done = 0
self.eof = 0