barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Err fallout for graph/iterator.LinksTo iterator

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 10:58:37 -07:00
parent accbc6007e
commit 745d4874e6
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
graph/iterator/linksto_iterator.go
View file

@ -45,6 +45,7 @@ type LinksTo struct {
dir quad.Direction dir quad.Direction
nextIt graph.Iterator nextIt graph.Iterator
result graph.Value result graph.Value
err error
runstats graph.IteratorStats runstats graph.IteratorStats
} }
@ -164,8 +165,17 @@ func (it *LinksTo) Next() bool {
return graph.NextLogOut(it, it.nextIt, true) return graph.NextLogOut(it, it.nextIt, true)
} }
// If there's an error in the 'next' iterator, we save it and we're done.
if err := graph.Err(it.nextIt); err != nil {
it.err = err
return false
}
// Subiterator is empty, get another one // Subiterator is empty, get another one
if !graph.Next(it.primaryIt) { if !graph.Next(it.primaryIt) {
// Possibly save error
it.err = it.primaryIt.Err()
// We're out of nodes in our subiterator, so we're done as well. // We're out of nodes in our subiterator, so we're done as well.
return graph.NextLogOut(it, 0, false) return graph.NextLogOut(it, 0, false)
} }
@ -176,6 +186,10 @@ func (it *LinksTo) Next() bool {
return it.Next() return it.Next()
} }
func (it *LinksTo) Err() error {
return it.err
}
func (it *LinksTo) Result() graph.Value { func (it *LinksTo) Result() graph.Value {
return it.result return it.result
} }