X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a1fc5b9e889f8359a32470c3a7d91190d0894899..44ff73fa397095d69819761e66933783a5f6d541:/sdk/python/arvados/stream.py diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py index 31638a0889..afc202e180 100644 --- 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)) - self._data_locators.append(Range(tok, streamoffset, blocksize)) + self._data_locators.append(Range(tok, streamoffset, blocksize, 0)) 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: - 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)) @@ -62,13 +62,10 @@ class StreamReader(object): 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 - 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)