dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@lag.net-20060420072627-958cad5e36cb8ecc] 

fix a bug where prefetch() at EOF would throw an exception, and add a unit test
This commit is contained in:
Robey Pointer 2006-04-20 00:26:27 -07:00
parent d965f00563
commit abb7f1f1ba
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
paramiko/sftp_file.py
View File

@ -93,7 +93,7 @@ class SFTPFile (BufferedFile):
if self._prefetch_done: if self._prefetch_done:
return None return None
self.sftp._read_response() self.sftp._read_response()
self._check_exception() self._check_exception()
k = self._prefetch_data.keys() k = self._prefetch_data.keys()
if len(k) == 0: if len(k) == 0:
self._prefetching = False self._prefetching = False
@ -362,7 +362,8 @@ class SFTPFile (BufferedFile):
chunk = min(self.MAX_REQUEST_SIZE, size - n) chunk = min(self.MAX_REQUEST_SIZE, size - n)
chunks.append((n, chunk)) chunks.append((n, chunk))
n += chunk n += chunk
self._start_prefetch(chunks) if len(chunks) > 0:
self._start_prefetch(chunks)
def readv(self, chunks): def readv(self, chunks):
""" """
@ -382,7 +383,8 @@ class SFTPFile (BufferedFile):
# put the offsets in order, since we depend on that for determining # put the offsets in order, since we depend on that for determining
# when the reads have finished. # when the reads have finished.
self.sftp._log(DEBUG, 'readv(%s, %r)' % (util.hexify(self.handle), chunks)) self.sftp._log(DEBUG, 'readv(%s, %r)' % (util.hexify(self.handle), chunks))
ordered_chunks = chunks[:] # FIXME: if prefetch() was already called (not readv), don't prefetch.
ordered_chunks = list(chunks)
ordered_chunks.sort(lambda x, y: cmp(x[0], y[0])) ordered_chunks.sort(lambda x, y: cmp(x[0], y[0]))
self._start_prefetch(ordered_chunks) self._start_prefetch(ordered_chunks)
# now we can just devolve to a bunch of read()s :) # now we can just devolve to a bunch of read()s :)
@ -407,7 +409,7 @@ class SFTPFile (BufferedFile):
self._prefetch_done = False self._prefetch_done = False
self._prefetch_so_far = chunks[0][0] self._prefetch_so_far = chunks[0][0]
self._prefetch_data = {} self._prefetch_data = {}
self._prefetch_reads.extend(chunks[:]) self._prefetch_reads.extend(chunks)
t = threading.Thread(target=self._prefetch_thread, args=(chunks,)) t = threading.Thread(target=self._prefetch_thread, args=(chunks,))
t.setDaemon(True) t.setDaemon(True)

17
tests/test_sftp.py
View File

@ -622,3 +622,20 @@ class SFTPTest (unittest.TestCase):
self.fail('exception ' + e) self.fail('exception ' + e)
sftp.unlink(FOLDER + '/\xc3\xbcnic\xc3\xb8\x64\x65') sftp.unlink(FOLDER + '/\xc3\xbcnic\xc3\xb8\x64\x65')
def test_L_bad_readv(self):
"""
verify that readv at the end of the file doesn't essplode.
"""
f = sftp.open(FOLDER + '/zero', 'w')
f.close()
try:
f = sftp.open(FOLDER + '/zero', 'r')
data = f.readv([(0, 12)])
f.close()
f = sftp.open(FOLDER + '/zero', 'r')
f.prefetch()
data = f.read(100)
f.close()
finally:
sftp.unlink(FOLDER + '/zero')