Skip to content

repository: two minor improvements #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

repository: two minor improvements #339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57845c0
Clean up fds of segments we delete (during compaction)
sourcejedi Aug 10, 2015
3321a88
io.write_commit() already implies io.close_segment()
sourcejedi Aug 10, 2015
d83b919
Style fix in added code
sourcejedi Aug 12, 2015
0488743
recover_segment(): don't assume we have an fd for segment
sourcejedi Aug 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions attic/repository.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ def report_error(msg):
report_error('Adding commit tag to segment {}'.format(transaction_id))
self.io.segment = transaction_id + 1
self.io.write_commit()
self.io.close_segment()
if current_index and not repair:
if len(current_index) != len(self.index):
report_error('Index object count mismatch. {} != {}'.format(len(current_index), len(self.index)))
Expand Down Expand Up @@ -478,6 +477,9 @@ def get_fd(self, segment):
return fd

def delete_segment(self, segment):
fd = self.fds.pop(segment)
if fd is not None:
fd.close()
try:
os.unlink(self.segment_filename(segment))
except OSError:
Expand Down Expand Up @@ -513,7 +515,9 @@ def iter_objects(self, segment, include_data=False):
header = fd.read(self.header_fmt.size)

def recover_segment(self, segment, filename):
self.fds.pop(segment).close()
fd = self.fds.pop(segment)
if fd is not None:
fd.close()
# FIXME: save a copy of the original file
with open(filename, 'rb') as fd:
data = memoryview(fd.read())
Expand Down