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

Simplify godoc

Browse source
This commit is contained in:
kortschak 2014-08-27 21:40:56 +09:30
parent 5e9da0347c
commit dccf38cba6
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
graph/memstore/all_iterator.go
View file

@ -24,22 +24,24 @@ type AllIterator struct {
qs *QuadStore qs *QuadStore
} }
type NodesAllIterator AllIterator type (
type QuadsAllIterator AllIterator nodesAllIterator AllIterator
quadsAllIterator AllIterator
)
func NewMemstoreNodesAllIterator(qs *QuadStore) *NodesAllIterator { func newNodesAllIterator(qs *QuadStore) *nodesAllIterator {
var out NodesAllIterator var out nodesAllIterator
out.Int64 = *iterator.NewInt64(1, qs.idCounter-1) out.Int64 = *iterator.NewInt64(1, qs.idCounter-1)
out.qs = qs out.qs = qs
return &out return &out
} }
// No subiterators. // No subiterators.
func (it *NodesAllIterator) SubIterators() []graph.Iterator { func (it *nodesAllIterator) SubIterators() []graph.Iterator {
return nil return nil
} }
func (it *NodesAllIterator) Next() bool { func (it *nodesAllIterator) Next() bool {
if !it.Int64.Next() { if !it.Int64.Next() {
return false return false
} }
@ -50,19 +52,19 @@ func (it *NodesAllIterator) Next() bool {
return true return true
} }
func NewMemstoreQuadsAllIterator(qs *QuadStore) *QuadsAllIterator { func newQuadsAllIterator(qs *QuadStore) *quadsAllIterator {
var out QuadsAllIterator var out quadsAllIterator
out.Int64 = *iterator.NewInt64(1, qs.quadIdCounter-1) out.Int64 = *iterator.NewInt64(1, qs.quadIdCounter-1)
out.qs = qs out.qs = qs
return &out return &out
} }
func (qit *QuadsAllIterator) Next() bool { func (it *quadsAllIterator) Next() bool {
out := qit.Int64.Next() out := it.Int64.Next()
if out { if out {
i64 := qit.Int64.Result().(int64) i64 := it.Int64.Result().(int64)
if qit.qs.log[i64].DeletedBy != 0 || qit.qs.log[i64].Action == graph.Delete { if it.qs.log[i64].DeletedBy != 0 || it.qs.log[i64].Action == graph.Delete {
return qit.Next() return it.Next()
} }
} }
return out return out

4
graph/memstore/quadstore.go
View file

@ -231,7 +231,7 @@ func (qs *QuadStore) NameOf(id graph.Value) string {
} }
func (qs *QuadStore) QuadsAllIterator() graph.Iterator { func (qs *QuadStore) QuadsAllIterator() graph.Iterator {
return NewMemstoreQuadsAllIterator(qs) return newQuadsAllIterator(qs)
} }
func (qs *QuadStore) FixedIterator() graph.FixedIterator { func (qs *QuadStore) FixedIterator() graph.FixedIterator {
@ -244,7 +244,7 @@ func (qs *QuadStore) QuadDirection(val graph.Value, d quad.Direction) graph.Valu
} }
func (qs *QuadStore) NodesAllIterator() graph.Iterator { func (qs *QuadStore) NodesAllIterator() graph.Iterator {
return NewMemstoreNodesAllIterator(qs) return newNodesAllIterator(qs)
} }
func (qs *QuadStore) Close() {} func (qs *QuadStore) Close() {}