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

Clean up style

Browse source
This commit is contained in:
kortschak 2014-08-02 22:45:19 +09:30
parent 8ccf842518
commit 15a45ef0d4
3 changed files with 59 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

10
query/gremlin/finals.go
View file

@ -248,8 +248,8 @@ func runIteratorWithCallback(it graph.Iterator, ses *Session, callback otto.Valu
}
func runIteratorOnSession(it graph.Iterator, ses *Session) {
if ses.lookingForQueryShape {
iterator.OutputQueryShapeForIterator(it, ses.ts, ses.queryShape)
if ses.wantShape {
iterator.OutputQueryShapeForIterator(it, ses.ts, ses.shape)
return
}
it, _ = it.Optimize()
@ -267,8 +267,7 @@ func runIteratorOnSession(it graph.Iterator, ses *Session) {
}
tags := make(map[string]graph.Value)
it.TagResults(tags)
cont := ses.SendResult(&GremlinResult{metaresult: false, err: nil, val: nil, actualResults: &tags})
if !cont {
if !ses.SendResult(&GremlinResult{actualResults: &tags}) {
break
}
for it.NextResult() == true {
@ -279,8 +278,7 @@ func runIteratorOnSession(it graph.Iterator, ses *Session) {
}
tags := make(map[string]graph.Value)
it.TagResults(tags)
cont := ses.SendResult(&GremlinResult{metaresult: false, err: nil, val: nil, actualResults: &tags})
if !cont {
if !ses.SendResult(&GremlinResult{actualResults: &tags}) {
break
}
}