ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mutable/retrieve: handle the case where self._read_length is 0.

Browse Source 
Note that the downloader will still fetch a segment for a zero-length
read, which is wasteful. Fixing that isn't specifically required to fix
#1512, but it should probably be fixed before 1.9.
This commit is contained in:
Kevan Carstensen 2011-08-30 14:01:41 -07:00
parent 1dcfec7ff3
commit 32e30c9023
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/allmydata/mutable/retrieve.py
View File

@ -404,18 +404,24 @@ class Retrieve:
self._start_segment = 0
if self._read_length:
# If self._read_length is None, then we want to read the whole
# file. Otherwise, we want to read only part of the file, and
# need to figure out where to stop reading.
if self._read_length is not None:
# our end segment is the last segment containing part of the
# segment that we were asked to read.
self.log("got read length %d" % self._read_length)
end_data = self._offset + self._read_length
if self._read_length != 0:
end_data = self._offset + self._read_length
# We don't actually need to read the byte at end_data, but
# the one before it.
end = (end_data - 1) // self._segment_size
# We don't actually need to read the byte at end_data,
# but the one before it.
end = (end_data - 1) // self._segment_size
assert end < self._num_segments
self._last_segment = end
assert end < self._num_segments
self._last_segment = end
else:
self._last_segment = self._start_segment
self.log("got end segment: %d" % self._last_segment)
else:
self._last_segment = self._num_segments - 1

6
src/allmydata/test/test_mutable.py
View File

@ -3305,6 +3305,7 @@ class Version(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin, \
def test_partial_read_ending_one_byte_after_segment_boundary(self):
return self._test_partial_read(mathutil.next_multiple(128 * 1024, 3)-50, 51)
# XXX factor these into a single upload after they pass
def test_partial_read_zero_length_at_start(self):
return self._test_partial_read(0, 0)
@ -3314,11 +3315,6 @@ class Version(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin, \
def test_partial_read_zero_length_at_segment_boundary(self):
return self._test_partial_read(mathutil.next_multiple(128 * 1024, 3), 0)
# XXX factor these into a single upload after they pass
_broken = "zero-length reads of mutable files don't work"
test_partial_read_zero_length_at_start.todo = _broken
test_partial_read_zero_length_in_middle.todo = _broken
test_partial_read_zero_length_at_segment_boundary.todo = _broken
def _test_read_and_download(self, node, expected):
d = node.get_best_readable_version()