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

Simplify Nexter interface

Browse source 
This change allows a Nexter to be used in the same manner as a scanner
using a for graph.Next(it) {} construction.

It is important that graph.Next(it) and any associated it.Result() calls
operate on the same iterator.
This commit is contained in:
kortschak 2014-08-01 09:15:02 +09:30
parent f8e28e066e
commit b1a70d99aa
31 changed files with 168 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

14
query/gremlin/finals.go
View file

@ -151,8 +151,7 @@ func runIteratorToArray(it graph.Iterator, ses *Session, limit int) []map[string
if ses.doHalt {
return nil
}
_, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
break
}
tags := make(map[string]graph.Value)
@ -187,11 +186,10 @@ func runIteratorToArrayNoTags(it graph.Iterator, ses *Session, limit int) []stri
if ses.doHalt {
return nil
}
val, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
break
}
output = append(output, ses.ts.NameOf(val))
output = append(output, ses.ts.NameOf(it.Result()))
count++
if limit >= 0 && count >= limit {
break
@ -208,8 +206,7 @@ func runIteratorWithCallback(it graph.Iterator, ses *Session, callback otto.Valu
if ses.doHalt {
return
}
_, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
break
}
tags := make(map[string]graph.Value)
@ -249,8 +246,7 @@ func runIteratorOnSession(it graph.Iterator, ses *Session) {
if ses.doHalt {
return
}
_, ok := graph.Next(it)
if !ok {
if !graph.Next(it) {
break
}
tags := make(map[string]graph.Value)