Merge branch 'master' of https://github.com/google/cayley into operators

Conflicts:
	query/gremlin/build_iterator.go
This commit is contained in:
Matei Chiperi 2014-09-08 17:04:48 -07:00
commit a718130f4a
83 changed files with 2370 additions and 2659 deletions

View file

@ -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 {
@ -273,7 +273,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))
}
}
}