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

Fix Err fallout for graph/bolt iterators

Browse source
This commit is contained in:
Andrew Dunham 2015-04-14 18:55:48 -07:00
parent aaa3f27754
commit 3ce9adbc0b
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
graph/bolt/all_iterator.go
View file

@ -33,6 +33,7 @@ type AllIterator struct {
dir quad.Direction dir quad.Direction
qs *QuadStore qs *QuadStore
result *Token result *Token
err error
buffer [][]byte buffer [][]byte
offset int offset int
done bool done bool
@ -121,6 +122,7 @@ func (it *AllIterator) Next() bool {
}) })
if err != nil { if err != nil {
glog.Error("Error nexting in database: ", err) glog.Error("Error nexting in database: ", err)
it.err = err
it.done = true it.done = true
return false return false
} }
@ -134,6 +136,10 @@ func (it *AllIterator) Next() bool {
return true return true
} }
func (it *AllIterator) Err() error {
return it.err
}
func (it *AllIterator) ResultTree() *graph.ResultTree { func (it *AllIterator) ResultTree() *graph.ResultTree {
return graph.NewResultTree(it.Result()) return graph.NewResultTree(it.Result())
} }

6
graph/bolt/iterator.go
View file

@ -46,6 +46,7 @@ type Iterator struct {
dir quad.Direction dir quad.Direction
qs *QuadStore qs *QuadStore
result *Token result *Token
err error
buffer [][]byte buffer [][]byte
offset int offset int
done bool done bool
@ -170,6 +171,7 @@ func (it *Iterator) Next() bool {
if err != nil { if err != nil {
if err != errNotExist { if err != errNotExist {
glog.Errorf("Error nexting in database: %v", err) glog.Errorf("Error nexting in database: %v", err)
it.err = err
} }
it.done = true it.done = true
return false return false
@ -184,6 +186,10 @@ func (it *Iterator) Next() bool {
return true return true
} }
func (it *Iterator) Err() error {
return it.err
}
func (it *Iterator) ResultTree() *graph.ResultTree { func (it *Iterator) ResultTree() *graph.ResultTree {
return graph.NewResultTree(it.Result()) return graph.NewResultTree(it.Result())
} }