projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7654-ws4py-hang' closes #7654
[arvados.git]
/
sdk
/
python
/
arvados
/
stream.py
diff --git
a/sdk/python/arvados/stream.py
b/sdk/python/arvados/stream.py
index 85c0320119acde2b745458b03d07abaa87fbbabd..afc202e1806cd9c5ce32ce4aa8e09777d527be0b 100644
(file)
--- a/
sdk/python/arvados/stream.py
+++ b/
sdk/python/arvados/stream.py
@@
-35,7
+35,7
@@
class StreamReader(object):
s = re.match(r'^[0-9a-f]{32}\+(\d+)(\+\S+)*$', tok)
if s:
blocksize = long(s.group(1))
s = re.match(r'^[0-9a-f]{32}\+(\d+)(\+\S+)*$', tok)
if s:
blocksize = long(s.group(1))
- self._data_locators.append(Range(tok, streamoffset, blocksize))
+ self._data_locators.append(Range(tok, streamoffset, blocksize
, 0
))
streamoffset += blocksize
continue
streamoffset += blocksize
continue
@@
-45,7
+45,7
@@
class StreamReader(object):
size = long(s.group(2))
name = s.group(3).replace('\\040', ' ')
if name not in self._files:
size = long(s.group(2))
name = s.group(3).replace('\\040', ' ')
if name not in self._files:
- self._files[name] = StreamFileReader(self, [Range(pos, 0, size)], name)
+ self._files[name] = StreamFileReader(self, [Range(pos, 0, size
, 0
)], name)
else:
filereader = self._files[name]
filereader.segments.append(Range(pos, filereader.size(), size))
else:
filereader = self._files[name]
filereader.segments.append(Range(pos, filereader.size(), size))
@@
-62,13
+62,10
@@
class StreamReader(object):
def all_files(self):
return self._files.values()
def all_files(self):
return self._files.values()
- def
_
size(self):
+ def size(self):
n = self._data_locators[-1]
return n.range_start + n.range_size
n = self._data_locators[-1]
return n.range_start + n.range_size
- def size(self):
- return self._size()
-
def locators_and_ranges(self, range_start, range_size):
return locators_and_ranges(self._data_locators, range_start, range_size)
def locators_and_ranges(self, range_start, range_size):
return locators_and_ranges(self._data_locators, range_start, range_size)
@@
-78,10
+75,6
@@
class StreamReader(object):
@retry_method
def readfrom(self, start, size, num_retries=None):
@retry_method
def readfrom(self, start, size, num_retries=None):
- return self._readfrom(start, size, num_retries=num_retries)
-
- @retry_method
- def _readfrom(self, start, size, num_retries=None):
"""Read up to 'size' bytes from the stream, starting at 'start'"""
if size == 0:
return ''
"""Read up to 'size' bytes from the stream, starting at 'start'"""
if size == 0:
return ''