redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-31 05:04:23 +03:00
Code Activity

fix iterator across empty pages

Browse Source
This commit is contained in:
vkd
2016-09-08 16:07:49 +03:00
parent 49f197e6d1
commit 76c33da3ee
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
iterator.go
View File

@ -46,25 +46,30 @@ func (it *ScanIterator) Next() bool {
return true
}
// Return if there is more data to fetch.
if it.ScanCmd.cursor == 0 {
return false
}
for {
// Return if there is more data to fetch.
if it.ScanCmd.cursor == 0 {
return false
}
// Fetch next page.
if it.ScanCmd._args[0] == "scan" {
it.ScanCmd._args[1] = it.ScanCmd.cursor
} else {
it.ScanCmd._args[2] = it.ScanCmd.cursor
}
it.ScanCmd.reset()
it.client.process(it.ScanCmd)
if it.ScanCmd.Err() != nil {
return false
}
// Fetch next page.
if it.ScanCmd._args[0] == "scan" {
it.ScanCmd._args[1] = it.ScanCmd.cursor
} else {
it.ScanCmd._args[2] = it.ScanCmd.cursor
}
it.ScanCmd.reset()
it.client.process(it.ScanCmd)
if it.ScanCmd.Err() != nil {
return false
}
it.pos = 1
return len(it.ScanCmd.page) > 0
it.pos = 1
if len(it.ScanCmd.page) > 0 {
return true
}
}
return false
}
// Val returns the key/field at the current cursor position.