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

Test for errors in .Contains() and .NextPath()

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 15:28:46 -07:00
parent 7de923d40a
commit 430ff507f0
8 changed files with 71 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
graph/iterator/or_iterator.go
View file

@ -174,7 +174,7 @@ func (it *Or) Result() graph.Value {
}
// Checks a value against the iterators, in order.
func (it *Or) subItsContain(val graph.Value) bool {
func (it *Or) subItsContain(val graph.Value) (bool, error) {
var subIsGood = false
for i, sub := range it.internalIterators {
subIsGood = sub.Contains(val)
@ -182,15 +182,21 @@ func (it *Or) subItsContain(val graph.Value) bool {
it.currentIterator = i
break
}
if err := sub.Err(); err != nil {
return false, err
}
}
return subIsGood
return subIsGood, nil
}
// Check a value against the entire graph.iterator, in order.
func (it *Or) Contains(val graph.Value) bool {
graph.ContainsLogIn(it, val)
anyGood := it.subItsContain(val)
if !anyGood {
anyGood, err := it.subItsContain(val)
if err != nil {
it.err = err
return false
} else if !anyGood {
return graph.ContainsLogOut(it, val, false)
}
it.result = val
@ -231,7 +237,12 @@ func (it *Or) Size() (int64, bool) {
// shortcircuiting, only allow new results from the currently checked graph.iterator
func (it *Or) NextPath() bool {
if it.currentIterator != -1 {
return it.internalIterators[it.currentIterator].NextPath()
currIt := it.internalIterators[it.currentIterator]
ret := currIt.NextPath()
if !ret {
it.err = currIt.Err()
}
return ret
}
return false
}