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

merge to master

Browse source
This commit is contained in:
Barak Michener 2014-08-06 16:21:57 -04:00
commit c64acabee0
30 changed files with 645 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/memstore/triplestore.go
View file

@ -120,7 +120,7 @@ func (ts *TripleStore) ApplyDeltas(deltas []*graph.Delta) error {
return nil
}
func (ts *TripleStore) quadExists(t *quad.Quad) (bool, int64) {
func (ts *TripleStore) quadExists(t quad.Quad) (bool, int64) {
smallest := -1
var smallest_tree *llrb.LLRB
for d := quad.Subject; d <= quad.Label; d++ {
@ -151,7 +151,7 @@ func (ts *TripleStore) quadExists(t *quad.Quad) (bool, int64) {
break
}
ival := val.(int64)
if t.Equals(&ts.log[ival].Quad) {
if t == ts.log[ival].Quad {
return true, ival
}
}
@ -159,7 +159,7 @@ func (ts *TripleStore) quadExists(t *quad.Quad) (bool, int64) {
}
func (ts *TripleStore) AddDelta(d *graph.Delta) error {
if exists, _ := ts.quadExists(&d.Quad); exists {
if exists, _ := ts.quadExists(d.Quad); exists {
return graph.ErrQuadExists
}
var quadID int64
@ -197,7 +197,7 @@ func (ts *TripleStore) RemoveDelta(d *graph.Delta) error {
var prevQuadID int64
var exists bool
prevQuadID = 0
if exists, prevQuadID = ts.quadExists(&d.Quad); !exists {
if exists, prevQuadID = ts.quadExists(d.Quad); !exists {
return graph.ErrQuadNotExist
}
@ -210,8 +210,8 @@ func (ts *TripleStore) RemoveDelta(d *graph.Delta) error {
return nil
}
func (ts *TripleStore) Quad(index graph.Value) *quad.Quad {
return &ts.log[index.(int64)].Quad
func (ts *TripleStore) Quad(index graph.Value) quad.Quad {
return ts.log[index.(int64)].Quad
}
func (ts *TripleStore) TripleIterator(d quad.Direction, value graph.Value) graph.Iterator {

6
graph/memstore/triplestore_test.go
View file

@ -38,7 +38,7 @@ import (
// \-->|#D#|------------->+---+
// +---+
//
var simpleGraph = []*quad.Quad{
var simpleGraph = []quad.Quad{
{"A", "follows", "B", ""},
{"C", "follows", "B", ""},
{"C", "follows", "D", ""},
@ -52,7 +52,7 @@ var simpleGraph = []*quad.Quad{
{"G", "status", "cool", "status_graph"},
}
func makeTestStore(data []*quad.Quad) (*TripleStore, graph.QuadWriter, []pair) {
func makeTestStore(data []quad.Quad) (*TripleStore, graph.QuadWriter, []pair) {
seen := make(map[string]struct{})
ts := newTripleStore()
var (
@ -178,7 +178,7 @@ func TestLinksToOptimization(t *testing.T) {
func TestRemoveTriple(t *testing.T) {
ts, w, _ := makeTestStore(simpleGraph)
w.RemoveQuad(&quad.Quad{"E", "follows", "F", ""})
w.RemoveQuad(quad.Quad{"E", "follows", "F", ""})
fixed := ts.FixedIterator()
fixed.Add(ts.ValueOf("E"))