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

Reduce TripleStore interface names

Browse source
This commit is contained in:
kortschak 2014-07-02 11:40:33 +09:30
parent 8576f66d20
commit b89d4f392c
29 changed files with 156 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

28
query/gremlin/build_iterator.go
View file

@ -68,14 +68,14 @@ func makeListOfStringsFromArrayValue(obj *otto.Object) []string {
func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator {
if val.IsNull() || val.IsUndefined() {
return ts.GetNodesAllIterator()
return ts.NodesAllIterator()
}
if val.IsPrimitive() {
thing, _ := val.Export()
switch v := thing.(type) {
case string:
it := ts.FixedIterator()
it.AddValue(ts.GetIdFor(v))
it.AddValue(ts.ValueOf(v))
return it
default:
glog.Errorln("Trying to build unknown primitive value.")
@ -89,7 +89,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator
strings := makeListOfStringsFromArrayValue(val.Object())
it := ts.FixedIterator()
for _, x := range strings {
it.AddValue(ts.GetIdFor(x))
it.AddValue(ts.ValueOf(x))
}
return it
case "Number":
@ -101,7 +101,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator
case "String":
it := ts.FixedIterator()
str, _ := val.ToString()
it.AddValue(ts.GetIdFor(str))
it.AddValue(ts.ValueOf(str))
return it
default:
glog.Errorln("Trying to handle unsupported Javascript value.")
@ -120,7 +120,7 @@ func buildInOutIterator(obj *otto.Object, ts graph.TripleStore, base graph.Itera
length, _ := lengthVal.ToInteger()
var predicateNodeIterator graph.Iterator
if length == 0 {
predicateNodeIterator = ts.GetNodesAllIterator()
predicateNodeIterator = ts.NodesAllIterator()
} else {
zero, _ := argArray.Get("0")
predicateNodeIterator = buildIteratorFromValue(zero, ts)
@ -168,11 +168,11 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
switch kind {
case "vertex":
if len(stringArgs) == 0 {
it = ts.GetNodesAllIterator()
it = ts.NodesAllIterator()
} else {
fixed := ts.FixedIterator()
for _, name := range stringArgs {
fixed.AddValue(ts.GetIdFor(name))
fixed.AddValue(ts.ValueOf(name))
}
it = fixed
}
@ -182,7 +182,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
it.AddTag(tag)
}
case "save":
all := ts.GetNodesAllIterator()
all := ts.NodesAllIterator()
if len(stringArgs) > 2 || len(stringArgs) == 0 {
return iterator.NewNull()
}
@ -192,7 +192,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
all.AddTag(stringArgs[0])
}
predFixed := ts.FixedIterator()
predFixed.AddValue(ts.GetIdFor(stringArgs[0]))
predFixed.AddValue(ts.ValueOf(stringArgs[0]))
subAnd := iterator.NewAnd()
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate))
subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, graph.Object))
@ -202,7 +202,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
and.AddSubIterator(subIt)
it = and
case "saver":
all := ts.GetNodesAllIterator()
all := ts.NodesAllIterator()
if len(stringArgs) > 2 || len(stringArgs) == 0 {
return iterator.NewNull()
}
@ -212,7 +212,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
all.AddTag(stringArgs[0])
}
predFixed := ts.FixedIterator()
predFixed.AddValue(ts.GetIdFor(stringArgs[0]))
predFixed.AddValue(ts.ValueOf(stringArgs[0]))
subAnd := iterator.NewAnd()
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate))
subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, graph.Subject))
@ -227,10 +227,10 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
return iterator.NewNull()
}
for _, name := range stringArgs[1:] {
fixed.AddValue(ts.GetIdFor(name))
fixed.AddValue(ts.ValueOf(name))
}
predFixed := ts.FixedIterator()
predFixed.AddValue(ts.GetIdFor(stringArgs[0]))
predFixed.AddValue(ts.ValueOf(stringArgs[0]))
subAnd := iterator.NewAnd()
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate))
subAnd.AddSubIterator(iterator.NewLinksTo(ts, fixed, graph.Object))
@ -263,7 +263,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
case "is":
fixed := ts.FixedIterator()
for _, name := range stringArgs {
fixed.AddValue(ts.GetIdFor(name))
fixed.AddValue(ts.ValueOf(name))
}
and := iterator.NewAnd()
and.AddSubIterator(fixed)

4
query/gremlin/finals.go
View file

@ -138,7 +138,7 @@ func mapFunc(env *otto.Otto, ses *Session, obj *otto.Object) func(otto.FunctionC
func tagsToValueMap(m map[string]graph.TSVal, ses *Session) map[string]string {
outputMap := make(map[string]string)
for k, v := range m {
outputMap[k] = ses.ts.GetNameFor(v)
outputMap[k] = ses.ts.NameOf(v)
}
return outputMap
}
@ -191,7 +191,7 @@ func runIteratorToArrayNoTags(it graph.Iterator, ses *Session, limit int) []stri
if !ok {
break
}
output = append(output, ses.ts.GetNameFor(val))
output = append(output, ses.ts.NameOf(val))
count++
if limit >= 0 && count >= limit {
break

2
query/gremlin/functional_test.go
View file

@ -63,7 +63,7 @@ func runQueryGetTag(query string, tag string) ([]string, int) {
if data.val == nil {
val := (*data.actualResults)[tag]
if val != nil {
output = append(output, js.ts.GetNameFor(val))
output = append(output, js.ts.NameOf(val))
}
}
}

4
query/gremlin/session.go
View file

@ -202,7 +202,7 @@ func (s *Session) ToText(result interface{}) string {
if k == "$_" {
continue
}
out += fmt.Sprintf("%s : %s\n", k, s.ts.GetNameFor((*tags)[k]))
out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf((*tags)[k]))
}
} else {
if data.val.IsObject() {
@ -234,7 +234,7 @@ func (ses *Session) BuildJson(result interface{}) {
}
sort.Strings(tagKeys)
for _, k := range tagKeys {
obj[k] = ses.ts.GetNameFor((*tags)[k])
obj[k] = ses.ts.NameOf((*tags)[k])
}
ses.dataOutput = append(ses.dataOutput, obj)
} else {

8
query/mql/build_iterator.go
View file

@ -27,12 +27,12 @@ import (
func (q *Query) buildFixed(s string) graph.Iterator {
f := q.ses.ts.FixedIterator()
f.AddValue(q.ses.ts.GetIdFor(s))
f.AddValue(q.ses.ts.ValueOf(s))
return f
}
func (q *Query) buildResultIterator(path Path) graph.Iterator {
all := q.ses.ts.GetNodesAllIterator()
all := q.ses.ts.NodesAllIterator()
all.AddTag(string(path))
return all
}
@ -103,7 +103,7 @@ func (q *Query) buildIteratorTreeInternal(query interface{}, path Path) (it grap
func (q *Query) buildIteratorTreeMapInternal(query map[string]interface{}, path Path) (graph.Iterator, error) {
it := iterator.NewAnd()
it.AddSubIterator(q.ses.ts.GetNodesAllIterator())
it.AddSubIterator(q.ses.ts.NodesAllIterator())
var err error
err = nil
outputStructure := make(map[string]interface{})
@ -138,7 +138,7 @@ func (q *Query) buildIteratorTreeMapInternal(query map[string]interface{}, path
}
subAnd := iterator.NewAnd()
predFixed := q.ses.ts.FixedIterator()
predFixed.AddValue(q.ses.ts.GetIdFor(pred))
predFixed.AddValue(q.ses.ts.ValueOf(pred))
subAnd.AddSubIterator(iterator.NewLinksTo(q.ses.ts, predFixed, graph.Predicate))
if reverse {
lto := iterator.NewLinksTo(q.ses.ts, builtIt, graph.Subject)

2
query/mql/fill.go
View file

@ -27,7 +27,7 @@ func (q *Query) treeifyResult(tags map[string]graph.TSVal) map[ResultPath]string
if v == nil {
continue
}
results[Path(k)] = q.ses.ts.GetNameFor(v)
results[Path(k)] = q.ses.ts.NameOf(v)
}
resultPaths := make(map[ResultPath]string)
for k, v := range results {

2
query/mql/session.go
View file

@ -121,7 +121,7 @@ func (s *Session) ToText(result interface{}) string {
if k == "$_" {
continue
}
out += fmt.Sprintf("%s : %s\n", k, s.ts.GetNameFor(tags[k]))
out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf(tags[k]))
}
return out
}