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

repository: refactor some duplicate code

Browse source
This commit is contained in:
Thomas Waldmann 2015-11-06 19:37:39 +01:00
parent f804c6fb1c
commit c01efa4666
1 changed files with 35 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
borg/repository.py
View file

@ -243,36 +243,44 @@ def replay_segments(self, index_transaction_id, segments_transaction_id):
continue continue
if segment > segments_transaction_id: if segment > segments_transaction_id:
break break
# code duplication below?? vvv (see similar code in check()) objects = self.io.iter_objects(segment)
self.segments[segment] = 0 self._update_index(segment, objects)
for tag, key, offset in self.io.iter_objects(segment):
if tag == TAG_PUT:
try:
s, _ = self.index[key]
self.compact.add(s)
self.segments[s] -= 1
except KeyError:
pass
self.index[key] = segment, offset
self.segments[segment] += 1
elif tag == TAG_DELETE:
try:
s, _ = self.index.pop(key)
self.segments[s] -= 1
self.compact.add(s)
except KeyError:
pass
self.compact.add(segment)
elif tag == TAG_COMMIT:
continue
else:
raise self.CheckNeeded(self.path)
if self.segments[segment] == 0:
self.compact.add(segment)
self.write_index() self.write_index()
finally: finally:
self.rollback() self.rollback()
def _update_index(self, segment, objects, report=None):
"""some code shared between replay_segments and check"""
self.segments[segment] = 0
for tag, key, offset in objects:
if tag == TAG_PUT:
try:
s, _ = self.index[key]
self.compact.add(s)
self.segments[s] -= 1
except KeyError:
pass
self.index[key] = segment, offset
self.segments[segment] += 1
elif tag == TAG_DELETE:
try:
s, _ = self.index.pop(key)
self.segments[s] -= 1
self.compact.add(s)
except KeyError:
pass
self.compact.add(segment)
elif tag == TAG_COMMIT:
continue
else:
msg = 'Unexpected tag {} in segment {}'.format(tag, segment)
if report is None:
raise self.CheckNeeded(msg)
else:
report(msg)
if self.segments[segment] == 0:
self.compact.add(segment)
def check(self, repair=False): def check(self, repair=False):
"""Check repository consistency """Check repository consistency
@ -312,29 +320,7 @@ def report_error(msg):
if repair: if repair:
self.io.recover_segment(segment, filename) self.io.recover_segment(segment, filename)
objects = list(self.io.iter_objects(segment)) objects = list(self.io.iter_objects(segment))
self.segments[segment] = 0 self._update_index(segment, objects, report_error)
for tag, key, offset in objects:
if tag == TAG_PUT:
try:
s, _ = self.index[key]
self.compact.add(s)
self.segments[s] -= 1
except KeyError:
pass
self.index[key] = segment, offset
self.segments[segment] += 1
elif tag == TAG_DELETE:
try:
s, _ = self.index.pop(key)
self.segments[s] -= 1
self.compact.add(s)
except KeyError:
pass
self.compact.add(segment)
elif tag == TAG_COMMIT:
continue
else:
report_error('Unexpected tag {} in segment {}'.format(tag, segment))
# self.index, self.segments, self.compact now reflect the state of the segment files up to <transaction_id> # self.index, self.segments, self.compact now reflect the state of the segment files up to <transaction_id>
# We might need to add a commit tag if no committed segment is found # We might need to add a commit tag if no committed segment is found
if repair and segments_transaction_id is None: if repair and segments_transaction_id is None: