Rename triple entities were relevant
This commit is contained in:
kortschak
parent
ddf8849e60
commit
443a091b72
62 changed files with 664 additions and 664 deletions
|
|
@ -34,11 +34,11 @@ func propertiesOf(obj *otto.Object, name string) []string {
|
|||
return export.([]string)
|
||||
}
|
||||
|
||||
func buildIteratorTree(obj *otto.Object, ts graph.TripleStore) graph.Iterator {
|
||||
func buildIteratorTree(obj *otto.Object, qs graph.QuadStore) graph.Iterator {
|
||||
if !isVertexChain(obj) {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
return buildIteratorTreeHelper(obj, ts, iterator.NewNull())
|
||||
return buildIteratorTreeHelper(obj, qs, iterator.NewNull())
|
||||
}
|
||||
|
||||
func stringsFrom(obj *otto.Object) []string {
|
||||
|
|
@ -57,16 +57,16 @@ func stringsFrom(obj *otto.Object) []string {
|
|||
return output
|
||||
}
|
||||
|
||||
func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator {
|
||||
func buildIteratorFromValue(val otto.Value, qs graph.QuadStore) graph.Iterator {
|
||||
if val.IsNull() || val.IsUndefined() {
|
||||
return ts.NodesAllIterator()
|
||||
return qs.NodesAllIterator()
|
||||
}
|
||||
if val.IsPrimitive() {
|
||||
thing, _ := val.Export()
|
||||
switch v := thing.(type) {
|
||||
case string:
|
||||
it := ts.FixedIterator()
|
||||
it.Add(ts.ValueOf(v))
|
||||
it := qs.FixedIterator()
|
||||
it.Add(qs.ValueOf(v))
|
||||
return it
|
||||
default:
|
||||
glog.Errorln("Trying to build unknown primitive value.")
|
||||
|
|
@ -74,13 +74,13 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator
|
|||
}
|
||||
switch val.Class() {
|
||||
case "Object":
|
||||
return buildIteratorTree(val.Object(), ts)
|
||||
return buildIteratorTree(val.Object(), qs)
|
||||
case "Array":
|
||||
// Had better be an array of strings
|
||||
strings := stringsFrom(val.Object())
|
||||
it := ts.FixedIterator()
|
||||
it := qs.FixedIterator()
|
||||
for _, x := range strings {
|
||||
it.Add(ts.ValueOf(x))
|
||||
it.Add(qs.ValueOf(x))
|
||||
}
|
||||
return it
|
||||
case "Number":
|
||||
|
|
@ -90,8 +90,8 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator
|
|||
case "Date":
|
||||
fallthrough
|
||||
case "String":
|
||||
it := ts.FixedIterator()
|
||||
it.Add(ts.ValueOf(val.String()))
|
||||
it := qs.FixedIterator()
|
||||
it.Add(qs.ValueOf(val.String()))
|
||||
return it
|
||||
default:
|
||||
glog.Errorln("Trying to handle unsupported Javascript value.")
|
||||
|
|
@ -99,7 +99,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator
|
|||
}
|
||||
}
|
||||
|
||||
func buildInOutIterator(obj *otto.Object, ts graph.TripleStore, base graph.Iterator, isReverse bool) graph.Iterator {
|
||||
func buildInOutIterator(obj *otto.Object, qs graph.QuadStore, base graph.Iterator, isReverse bool) graph.Iterator {
|
||||
argList, _ := obj.Get("_gremlin_values")
|
||||
if argList.Class() != "GoArray" {
|
||||
glog.Errorln("How is arglist not an array? Return nothing.", argList.Class())
|
||||
|
|
@ -110,10 +110,10 @@ func buildInOutIterator(obj *otto.Object, ts graph.TripleStore, base graph.Itera
|
|||
length, _ := lengthVal.ToInteger()
|
||||
var predicateNodeIterator graph.Iterator
|
||||
if length == 0 {
|
||||
predicateNodeIterator = ts.NodesAllIterator()
|
||||
predicateNodeIterator = qs.NodesAllIterator()
|
||||
} else {
|
||||
zero, _ := argArray.Get("0")
|
||||
predicateNodeIterator = buildIteratorFromValue(zero, ts)
|
||||
predicateNodeIterator = buildIteratorFromValue(zero, qs)
|
||||
}
|
||||
if length >= 2 {
|
||||
var tags []string
|
||||
|
|
@ -132,14 +132,14 @@ func buildInOutIterator(obj *otto.Object, ts graph.TripleStore, base graph.Itera
|
|||
if isReverse {
|
||||
in, out = out, in
|
||||
}
|
||||
lto := iterator.NewLinksTo(ts, base, in)
|
||||
lto := iterator.NewLinksTo(qs, base, in)
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(iterator.NewLinksTo(ts, predicateNodeIterator, quad.Predicate))
|
||||
and.AddSubIterator(iterator.NewLinksTo(qs, predicateNodeIterator, quad.Predicate))
|
||||
and.AddSubIterator(lto)
|
||||
return iterator.NewHasA(ts, and, out)
|
||||
return iterator.NewHasA(qs, and, out)
|
||||
}
|
||||
|
||||
func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.Iterator) graph.Iterator {
|
||||
func buildIteratorTreeHelper(obj *otto.Object, qs graph.QuadStore, base graph.Iterator) graph.Iterator {
|
||||
var it graph.Iterator = base
|
||||
|
||||
// TODO: Better error handling
|
||||
|
|
@ -147,7 +147,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
if prev, _ := obj.Get("_gremlin_prev"); !prev.IsObject() {
|
||||
subIt = base
|
||||
} else {
|
||||
subIt = buildIteratorTreeHelper(prev.Object(), ts, base)
|
||||
subIt = buildIteratorTreeHelper(prev.Object(), qs, base)
|
||||
}
|
||||
|
||||
stringArgs := propertiesOf(obj, "string_args")
|
||||
|
|
@ -155,11 +155,11 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
switch val.String() {
|
||||
case "vertex":
|
||||
if len(stringArgs) == 0 {
|
||||
it = ts.NodesAllIterator()
|
||||
it = qs.NodesAllIterator()
|
||||
} else {
|
||||
fixed := ts.FixedIterator()
|
||||
fixed := qs.FixedIterator()
|
||||
for _, name := range stringArgs {
|
||||
fixed.Add(ts.ValueOf(name))
|
||||
fixed.Add(qs.ValueOf(name))
|
||||
}
|
||||
it = fixed
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
it.Tagger().Add(tag)
|
||||
}
|
||||
case "save":
|
||||
all := ts.NodesAllIterator()
|
||||
all := qs.NodesAllIterator()
|
||||
if len(stringArgs) > 2 || len(stringArgs) == 0 {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
|
|
@ -178,18 +178,18 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
} else {
|
||||
all.Tagger().Add(stringArgs[0])
|
||||
}
|
||||
predFixed := ts.FixedIterator()
|
||||
predFixed.Add(ts.ValueOf(stringArgs[0]))
|
||||
predFixed := qs.FixedIterator()
|
||||
predFixed.Add(qs.ValueOf(stringArgs[0]))
|
||||
subAnd := iterator.NewAnd()
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, quad.Object))
|
||||
hasa := iterator.NewHasA(ts, subAnd, quad.Subject)
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, all, quad.Object))
|
||||
hasa := iterator.NewHasA(qs, subAnd, quad.Subject)
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(hasa)
|
||||
and.AddSubIterator(subIt)
|
||||
it = and
|
||||
case "saver":
|
||||
all := ts.NodesAllIterator()
|
||||
all := qs.NodesAllIterator()
|
||||
if len(stringArgs) > 2 || len(stringArgs) == 0 {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
|
|
@ -198,30 +198,30 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
} else {
|
||||
all.Tagger().Add(stringArgs[0])
|
||||
}
|
||||
predFixed := ts.FixedIterator()
|
||||
predFixed.Add(ts.ValueOf(stringArgs[0]))
|
||||
predFixed := qs.FixedIterator()
|
||||
predFixed.Add(qs.ValueOf(stringArgs[0]))
|
||||
subAnd := iterator.NewAnd()
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, quad.Subject))
|
||||
hasa := iterator.NewHasA(ts, subAnd, quad.Object)
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, all, quad.Subject))
|
||||
hasa := iterator.NewHasA(qs, subAnd, quad.Object)
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(hasa)
|
||||
and.AddSubIterator(subIt)
|
||||
it = and
|
||||
case "has":
|
||||
fixed := ts.FixedIterator()
|
||||
fixed := qs.FixedIterator()
|
||||
if len(stringArgs) < 2 {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
for _, name := range stringArgs[1:] {
|
||||
fixed.Add(ts.ValueOf(name))
|
||||
fixed.Add(qs.ValueOf(name))
|
||||
}
|
||||
predFixed := ts.FixedIterator()
|
||||
predFixed.Add(ts.ValueOf(stringArgs[0]))
|
||||
predFixed := qs.FixedIterator()
|
||||
predFixed.Add(qs.ValueOf(stringArgs[0]))
|
||||
subAnd := iterator.NewAnd()
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(ts, fixed, quad.Object))
|
||||
hasa := iterator.NewHasA(ts, subAnd, quad.Subject)
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, predFixed, quad.Predicate))
|
||||
subAnd.AddSubIterator(iterator.NewLinksTo(qs, fixed, quad.Object))
|
||||
hasa := iterator.NewHasA(qs, subAnd, quad.Subject)
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(hasa)
|
||||
and.AddSubIterator(subIt)
|
||||
|
|
@ -234,7 +234,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
if !isVertexChain(firstArg.Object()) {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
argIt := buildIteratorTree(firstArg.Object(), ts)
|
||||
argIt := buildIteratorTree(firstArg.Object(), qs)
|
||||
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(subIt)
|
||||
|
|
@ -242,15 +242,15 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
it = and
|
||||
case "back":
|
||||
arg, _ := obj.Get("_gremlin_back_chain")
|
||||
argIt := buildIteratorTree(arg.Object(), ts)
|
||||
argIt := buildIteratorTree(arg.Object(), qs)
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(subIt)
|
||||
and.AddSubIterator(argIt)
|
||||
it = and
|
||||
case "is":
|
||||
fixed := ts.FixedIterator()
|
||||
fixed := qs.FixedIterator()
|
||||
for _, name := range stringArgs {
|
||||
fixed.Add(ts.ValueOf(name))
|
||||
fixed.Add(qs.ValueOf(name))
|
||||
}
|
||||
and := iterator.NewAnd()
|
||||
and.AddSubIterator(fixed)
|
||||
|
|
@ -262,7 +262,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
if !isVertexChain(firstArg.Object()) {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
argIt := buildIteratorTree(firstArg.Object(), ts)
|
||||
argIt := buildIteratorTree(firstArg.Object(), qs)
|
||||
|
||||
or := iterator.NewOr()
|
||||
or.AddSubIterator(subIt)
|
||||
|
|
@ -272,15 +272,15 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
// Hardly the most efficient pattern, but the most general.
|
||||
// Worth looking into an Optimize() optimization here.
|
||||
clone := subIt.Clone()
|
||||
it1 := buildInOutIterator(obj, ts, subIt, false)
|
||||
it2 := buildInOutIterator(obj, ts, clone, true)
|
||||
it1 := buildInOutIterator(obj, qs, subIt, false)
|
||||
it2 := buildInOutIterator(obj, qs, clone, true)
|
||||
|
||||
or := iterator.NewOr()
|
||||
or.AddSubIterator(it1)
|
||||
or.AddSubIterator(it2)
|
||||
it = or
|
||||
case "out":
|
||||
it = buildInOutIterator(obj, ts, subIt, false)
|
||||
it = buildInOutIterator(obj, qs, subIt, false)
|
||||
case "follow":
|
||||
// Follow a morphism
|
||||
arg, _ := obj.Get("_gremlin_values")
|
||||
|
|
@ -288,16 +288,16 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph.
|
|||
if isVertexChain(firstArg.Object()) {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
it = buildIteratorTreeHelper(firstArg.Object(), ts, subIt)
|
||||
it = buildIteratorTreeHelper(firstArg.Object(), qs, subIt)
|
||||
case "followr":
|
||||
// Follow a morphism
|
||||
arg, _ := obj.Get("_gremlin_followr")
|
||||
if isVertexChain(arg.Object()) {
|
||||
return iterator.NewNull()
|
||||
}
|
||||
it = buildIteratorTreeHelper(arg.Object(), ts, subIt)
|
||||
it = buildIteratorTreeHelper(arg.Object(), qs, subIt)
|
||||
case "in":
|
||||
it = buildInOutIterator(obj, ts, subIt, true)
|
||||
it = buildInOutIterator(obj, qs, subIt, true)
|
||||
}
|
||||
return it
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import (
|
|||
)
|
||||
|
||||
type worker struct {
|
||||
ts graph.TripleStore
|
||||
qs graph.QuadStore
|
||||
env *otto.Otto
|
||||
sync.Mutex
|
||||
|
||||
|
|
@ -39,10 +39,10 @@ type worker struct {
|
|||
kill <-chan struct{}
|
||||
}
|
||||
|
||||
func newWorker(ts graph.TripleStore) *worker {
|
||||
func newWorker(qs graph.QuadStore) *worker {
|
||||
env := otto.New()
|
||||
wk := &worker{
|
||||
ts: ts,
|
||||
qs: qs,
|
||||
env: env,
|
||||
limit: -1,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ func (wk *worker) embedFinals(env *otto.Otto, obj *otto.Object) {
|
|||
|
||||
func (wk *worker) allFunc(env *otto.Otto, obj *otto.Object) func(otto.FunctionCall) otto.Value {
|
||||
return func(call otto.FunctionCall) otto.Value {
|
||||
it := buildIteratorTree(obj, wk.ts)
|
||||
it := buildIteratorTree(obj, wk.qs)
|
||||
it.Tagger().Add(TopResultTag)
|
||||
wk.limit = -1
|
||||
wk.count = 0
|
||||
|
|
@ -52,7 +52,7 @@ func (wk *worker) limitFunc(env *otto.Otto, obj *otto.Object) func(otto.Function
|
|||
return func(call otto.FunctionCall) otto.Value {
|
||||
if len(call.ArgumentList) > 0 {
|
||||
limitVal, _ := call.Argument(0).ToInteger()
|
||||
it := buildIteratorTree(obj, wk.ts)
|
||||
it := buildIteratorTree(obj, wk.qs)
|
||||
it.Tagger().Add(TopResultTag)
|
||||
wk.limit = int(limitVal)
|
||||
wk.count = 0
|
||||
|
|
@ -64,7 +64,7 @@ func (wk *worker) limitFunc(env *otto.Otto, obj *otto.Object) func(otto.Function
|
|||
|
||||
func (wk *worker) toArrayFunc(env *otto.Otto, obj *otto.Object, withTags bool) func(otto.FunctionCall) otto.Value {
|
||||
return func(call otto.FunctionCall) otto.Value {
|
||||
it := buildIteratorTree(obj, wk.ts)
|
||||
it := buildIteratorTree(obj, wk.qs)
|
||||
it.Tagger().Add(TopResultTag)
|
||||
limit := -1
|
||||
if len(call.ArgumentList) > 0 {
|
||||
|
|
@ -91,7 +91,7 @@ func (wk *worker) toArrayFunc(env *otto.Otto, obj *otto.Object, withTags bool) f
|
|||
|
||||
func (wk *worker) toValueFunc(env *otto.Otto, obj *otto.Object, withTags bool) func(otto.FunctionCall) otto.Value {
|
||||
return func(call otto.FunctionCall) otto.Value {
|
||||
it := buildIteratorTree(obj, wk.ts)
|
||||
it := buildIteratorTree(obj, wk.qs)
|
||||
it.Tagger().Add(TopResultTag)
|
||||
limit := 1
|
||||
var val otto.Value
|
||||
|
|
@ -120,7 +120,7 @@ func (wk *worker) toValueFunc(env *otto.Otto, obj *otto.Object, withTags bool) f
|
|||
|
||||
func (wk *worker) mapFunc(env *otto.Otto, obj *otto.Object) func(otto.FunctionCall) otto.Value {
|
||||
return func(call otto.FunctionCall) otto.Value {
|
||||
it := buildIteratorTree(obj, wk.ts)
|
||||
it := buildIteratorTree(obj, wk.qs)
|
||||
it.Tagger().Add(TopResultTag)
|
||||
limit := -1
|
||||
if len(call.ArgumentList) == 0 {
|
||||
|
|
@ -139,7 +139,7 @@ func (wk *worker) mapFunc(env *otto.Otto, obj *otto.Object) func(otto.FunctionCa
|
|||
func (wk *worker) tagsToValueMap(m map[string]graph.Value) map[string]string {
|
||||
outputMap := make(map[string]string)
|
||||
for k, v := range m {
|
||||
outputMap[k] = wk.ts.NameOf(v)
|
||||
outputMap[k] = wk.qs.NameOf(v)
|
||||
}
|
||||
return outputMap
|
||||
}
|
||||
|
|
@ -196,7 +196,7 @@ func (wk *worker) runIteratorToArrayNoTags(it graph.Iterator, limit int) []strin
|
|||
if !graph.Next(it) {
|
||||
break
|
||||
}
|
||||
output = append(output, wk.ts.NameOf(it.Result()))
|
||||
output = append(output, wk.qs.NameOf(it.Result()))
|
||||
n++
|
||||
if limit >= 0 && n >= limit {
|
||||
break
|
||||
|
|
@ -269,7 +269,7 @@ func (wk *worker) send(r *Result) bool {
|
|||
|
||||
func (wk *worker) runIterator(it graph.Iterator) {
|
||||
if wk.wantShape() {
|
||||
iterator.OutputQueryShapeForIterator(it, wk.ts, wk.shape)
|
||||
iterator.OutputQueryShapeForIterator(it, wk.qs, wk.shape)
|
||||
return
|
||||
}
|
||||
it, _ = it.Optimize()
|
||||
|
|
|
|||
|
|
@ -54,12 +54,12 @@ var simpleGraph = []quad.Quad{
|
|||
}
|
||||
|
||||
func makeTestSession(data []quad.Quad) *Session {
|
||||
ts, _ := graph.NewTripleStore("memstore", "", nil)
|
||||
w, _ := graph.NewQuadWriter("single", ts, nil)
|
||||
qs, _ := graph.NewQuadStore("memstore", "", nil)
|
||||
w, _ := graph.NewQuadWriter("single", qs, nil)
|
||||
for _, t := range data {
|
||||
w.AddQuad(t)
|
||||
}
|
||||
return NewSession(ts, -1, false)
|
||||
return NewSession(qs, -1, false)
|
||||
}
|
||||
|
||||
var testQueries = []struct {
|
||||
|
|
@ -259,7 +259,7 @@ func runQueryGetTag(g []quad.Quad, query string, tag string) []string {
|
|||
if data.val == nil {
|
||||
val := data.actualResults[tag]
|
||||
if val != nil {
|
||||
results = append(results, js.ts.NameOf(val))
|
||||
results = append(results, js.qs.NameOf(val))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import (
|
|||
var ErrKillTimeout = errors.New("query timed out")
|
||||
|
||||
type Session struct {
|
||||
ts graph.TripleStore
|
||||
qs graph.QuadStore
|
||||
|
||||
wk *worker
|
||||
script *otto.Script
|
||||
|
|
@ -45,10 +45,10 @@ type Session struct {
|
|||
err error
|
||||
}
|
||||
|
||||
func NewSession(ts graph.TripleStore, timeout time.Duration, persist bool) *Session {
|
||||
func NewSession(qs graph.QuadStore, timeout time.Duration, persist bool) *Session {
|
||||
g := Session{
|
||||
ts: ts,
|
||||
wk: newWorker(ts),
|
||||
qs: qs,
|
||||
wk: newWorker(qs),
|
||||
timeout: timeout,
|
||||
}
|
||||
if persist {
|
||||
|
|
@ -185,7 +185,7 @@ func (s *Session) ToText(result interface{}) string {
|
|||
if k == "$_" {
|
||||
continue
|
||||
}
|
||||
out += fmt.Sprintf("%s : %s\n", k, s.ts.NameOf(tags[k]))
|
||||
out += fmt.Sprintf("%s : %s\n", k, s.qs.NameOf(tags[k]))
|
||||
}
|
||||
} else {
|
||||
if data.val.IsObject() {
|
||||
|
|
@ -217,7 +217,7 @@ func (s *Session) BuildJson(result interface{}) {
|
|||
}
|
||||
sort.Strings(tagKeys)
|
||||
for _, k := range tagKeys {
|
||||
obj[k] = s.ts.NameOf(tags[k])
|
||||
obj[k] = s.qs.NameOf(tags[k])
|
||||
}
|
||||
s.dataOutput = append(s.dataOutput, obj)
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue