mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-25 07:23:28 +00:00
Code Issues Releases Wiki Activity

micro opt: callers shall provide a memoryview to .decompress()

Browse source 
if they would call with a bytes object, it would usually cause
1 object copy to remove the compression type bytes.
This commit is contained in:
Thomas Waldmann 2022-04-01 21:17:07 +02:00
parent df23f3ed22
commit 154e5d87e7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/compress.pyx
View file

@ -90,8 +90,8 @@ cdef class CompressorBase:
def decompress(self, data): def decompress(self, data):
""" """
Decompress *data* (bytes) and return bytes result. The leading Compressor ID Decompress *data* (preferably a memoryview, bytes also acceptable) and return bytes result.
bytes need to be present. The leading Compressor ID bytes need to be present.
Only handles input generated by _this_ Compressor - for a general purpose Only handles input generated by _this_ Compressor - for a general purpose
decompression method see *Compressor.decompress*. decompression method see *Compressor.decompress*.
@ -489,8 +489,6 @@ class ObfuscateSize(CompressorBase):
return super().compress(obfuscated_data) # add ID header return super().compress(obfuscated_data) # add ID header
def decompress(self, data): def decompress(self, data):
if not isinstance(data, memoryview):
data = memoryview(data)
obfuscated_data = super().decompress(data) # remove obfuscator ID header obfuscated_data = super().decompress(data) # remove obfuscator ID header
compr_size = self.header_fmt.unpack(obfuscated_data[0:self.header_len])[0] compr_size = self.header_fmt.unpack(obfuscated_data[0:self.header_len])[0]
compressed_data = obfuscated_data[self.header_len:self.header_len+compr_size] compressed_data = obfuscated_data[self.header_len:self.header_len+compr_size]

4
src/borg/crypto/key.py
View file

@ -355,7 +355,7 @@ def decrypt(self, id, data, decompress=True):
raise IntegrityError(f"Chunk {bin_to_hex(id)}: Could not decrypt [{str(e)}]") raise IntegrityError(f"Chunk {bin_to_hex(id)}: Could not decrypt [{str(e)}]")
if not decompress: if not decompress:
return payload return payload
data = self.decompress(payload) data = self.decompress(memoryview(payload))
self.assert_id(id, data) self.assert_id(id, data)
return data return data
@ -745,7 +745,7 @@ def decrypt(self, id, data, decompress=True):
raise IntegrityError(f"Chunk {bin_to_hex(id)}: Could not decrypt [{str(e)}]") raise IntegrityError(f"Chunk {bin_to_hex(id)}: Could not decrypt [{str(e)}]")
if not decompress: if not decompress:
return payload return payload
data = self.decompress(payload) data = self.decompress(memoryview(payload))
self.assert_id(id, data) self.assert_id(id, data)
return data return data