X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c691e44f9183176581dd8da6417af16772baf510..a4211acb465bd42869bf2a2f9fad6ff2c5e518e0:/sdk/python/arvados/_ranges.py diff --git a/sdk/python/arvados/_ranges.py b/sdk/python/arvados/_ranges.py index ba92f93820..d4f20f0008 100644 --- a/sdk/python/arvados/_ranges.py +++ b/sdk/python/arvados/_ranges.py @@ -32,7 +32,7 @@ def first_block(data_locators, range_start, range_size): block_end = block_start + block_size # perform a binary search for the first block - # assumes that all of the blocks are contigious, so range_start is guaranteed + # assumes that all of the blocks are contiguous, so range_start is guaranteed # to either fall into the range of a block or be outside the block range entirely while not (range_start >= block_start and range_start < block_end): if lo == i: @@ -96,7 +96,9 @@ def locators_and_ranges(data_locators, range_start, range_size): block_start = dl.range_start block_size = dl.range_size block_end = block_start + block_size - _logger.debug(dl.locator, "range_start", range_start, "block_start", block_start, "range_end", range_end, "block_end", block_end) + _logger.debug( + "%s range_start %s block_start %s range_end %s block_end %s", + dl.locator, range_start, block_start, range_end, block_end) if range_end <= block_start: # range ends before this block starts, so don't look at any more locators break @@ -125,7 +127,7 @@ def replace_range(data_locators, new_range_start, new_range_size, new_locator, n data_locators will be updated in place :data_locators: - list of Range objects, assumes that segments are in order and contigous + list of Range objects, assumes that segments are in order and contiguous :new_range_start: start of range to replace in data_locators @@ -168,7 +170,10 @@ def replace_range(data_locators, new_range_start, new_range_size, new_locator, n dl = data_locators[i] old_segment_start = dl.range_start old_segment_end = old_segment_start + dl.range_size - _logger.debug(dl, "range_start", new_range_start, "segment_start", old_segment_start, "range_end", new_range_end, "segment_end", old_segment_end) + _logger.debug( + "%s range_start %s segment_start %s range_end %s segment_end %s", + dl, new_range_start, old_segment_start, new_range_end, + old_segment_end) if new_range_end <= old_segment_start: # range ends before this segment starts, so don't look at any more locators break