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

Merge pull request #218 from barakmich/primarykey

Browse source 
Fix PrimaryKey Marshalling and add Bolt test
This commit is contained in:
Barak Michener 2015-04-04 18:05:04 -04:00
commit f1579c1e25
3 changed files with 471 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
graph/bolt/quadstore.go
View file

@ -368,7 +368,7 @@ func (qs *QuadStore) Close() {
}
func (qs *QuadStore) Quad(k graph.Value) quad.Quad {
var q quad.Quad
var d graph.Delta
tok := k.(*Token)
err := qs.db.View(func(tx *bolt.Tx) error {
b := tx.Bucket(tok.bucket)
@ -390,13 +390,13 @@ func (qs *QuadStore) Quad(k graph.Value) quad.Quad {
// No harm, no foul.
return nil
}
return json.Unmarshal(data, &q)
return json.Unmarshal(data, &d)
})
if err != nil {
glog.Error("Error getting quad: ", err)
return quad.Quad{}
}
return q
return d.Quad
}
func (qs *QuadStore) ValueOf(s string) graph.Value {