mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

transform _chunk_content_equal into a global function to ease later benchmarking

This commit is contained in:
Ronny Pfannschmidt 2021-05-02 17:29:37 +02:00
parent c88a37eea4
commit 603023bbd5
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/borg/item.pyx
View File

@ -517,10 +517,10 @@ class ItemDiff:
return self._item1.chunks == self._item2.chunks return self._item1.chunks == self._item2.chunks
if self._item1.get_size() != self._item2.get_size(): if self._item1.get_size() != self._item2.get_size():
return False return False
return ItemDiff._chunk_content_equal(chunk_iterator1, chunk_iterator2) return chunks_contents_equal(chunk_iterator1, chunk_iterator2)
@staticmethod
def _chunk_content_equal(chunks1, chunks2): def chunks_contents_equal(chunks1, chunks2):
""" """
Compare chunk content and return True if they are identical. Compare chunk content and return True if they are identical.

6
src/borg/testsuite/archiver.py
View File

@ -47,7 +47,7 @@ from ..helpers import msgpack
from ..helpers import flags_noatime, flags_normal from ..helpers import flags_noatime, flags_normal
from ..nanorst import RstToTextLazy, rst_to_terminal from ..nanorst import RstToTextLazy, rst_to_terminal
from ..patterns import IECommand, PatternMatcher, parse_pattern from ..patterns import IECommand, PatternMatcher, parse_pattern
from ..item import Item, ItemDiff from ..item import Item, ItemDiff, chunks_contents_equal
from ..locking import LockFailed from ..locking import LockFailed
from ..logger import setup_logging from ..logger import setup_logging
from ..remote import RemoteRepository, PathNotAllowed from ..remote import RemoteRepository, PathNotAllowed
@ -4218,8 +4218,8 @@ def test_chunk_content_equal():
def ccc(a, b): def ccc(a, b):
chunks_a = [data for data in a] chunks_a = [data for data in a]
chunks_b = [data for data in b] chunks_b = [data for data in b]
compare1 = ItemDiff._chunk_content_equal(iter(chunks_a), iter(chunks_b)) compare1 = chunks_contents_equal(iter(chunks_a), iter(chunks_b))
compare2 = ItemDiff._chunk_content_equal(iter(chunks_b), iter(chunks_a)) compare2 = chunks_contents_equal(iter(chunks_b), iter(chunks_a))
assert compare1 == compare2 assert compare1 == compare2
return compare1 return compare1
assert ccc([ assert ccc([