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

Address review comments

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 16:28:13 -07:00
parent 430ff507f0
commit 5eed4d9667
19 changed files with 125 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graph/iterator/materialize_iterator.go
View file

@ -48,8 +48,8 @@ type Materialize struct {
subIt graph.Iterator
hasRun bool
aborted bool
err error
runstats graph.IteratorStats
err error
}
func NewMaterialize(sub graph.Iterator) *Materialize {
@ -206,9 +206,7 @@ func (it *Materialize) Next() bool {
}
if it.aborted {
n := graph.Next(it.subIt)
if err := it.subIt.Err(); err != nil {
it.err = err
}
it.err = it.subIt.Err()
return n
}
@ -302,9 +300,8 @@ func (it *Materialize) materializeSet() {
it.actualSize += 1
}
}
if err := it.subIt.Err(); err != nil {
it.err = err
} else if it.aborted {
it.err = it.subIt.Err()
if it.err == nil && it.aborted {
if glog.V(2) {
glog.V(2).Infoln("Aborting subiterator")
}