Skip to content

hashindex: fix iterator implementation #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enkore merged 1 commit into from
Sep 29, 2016
Merged

hashindex: fix iterator implementation #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions borg/hashindex.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,22 @@ cdef class NSKeyIterator:
cdef HashIndex *index
cdef const void *key
cdef int key_size
cdef int exhausted

def __cinit__(self, key_size):
self.key = NULL
self.key_size = key_size
self.exhausted = 0

def __iter__(self):
return self

def __next__(self):
if self.exhausted:
raise StopIteration
self.key = hashindex_next_key(self.index, <char *>self.key)
if not self.key:
self.exhausted = 1
raise StopIteration
cdef uint32_t *value = <uint32_t *>(self.key + self.key_size)
cdef uint32_t segment = _le32toh(value[0])
Expand Down Expand Up @@ -330,17 +335,22 @@ cdef class ChunkKeyIterator:
cdef HashIndex *index
cdef const void *key
cdef int key_size
cdef int exhausted

def __cinit__(self, key_size):
self.key = NULL
self.key_size = key_size
self.exhausted = 0

def __iter__(self):
return self

def __next__(self):
if self.exhausted:
raise StopIteration
self.key = hashindex_next_key(self.index, <char *>self.key)
if not self.key:
self.exhausted = 1
raise StopIteration
cdef uint32_t *value = <uint32_t *>(self.key + self.key_size)
cdef uint32_t refcount = _le32toh(value[0])
Expand Down
5 changes: 4 additions & 1 deletion borg/testsuite/hashindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,11 @@ def test_iteritems(self):
idx = NSIndex()
for x in range(100):
idx[H(x)] = x, x
all = list(idx.iteritems())
iterator = idx.iteritems()
all = list(iterator)
self.assert_equal(len(all), 100)
# iterator is already exhausted by list():
self.assert_raises(StopIteration, next, iterator)
second_half = list(idx.iteritems(marker=all[49][0]))
self.assert_equal(len(second_half), 50)
self.assert_equal(second_half, all[50:])
Expand Down