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

Improve Transaction: deduplicate quads, allow adding/removing a quad in the same tx

Browse source
This commit is contained in:
Quentin Machu 2015-10-06 15:21:33 -04:00
parent 45d96e14ec
commit 91fc9ee3de
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/transaction.go
View file

@ -16,19 +16,19 @@ package graph
import "github.com/google/cayley/quad" import "github.com/google/cayley/quad"
// Transaction stores a bunch of Deltas to apply atomatically on the database // Transaction stores a bunch of Deltas to apply atomatically on the database.
type Transaction struct { type Transaction struct {
Deltas map[Delta]struct{} Deltas map[Delta]struct{}
} }
// NewTransaction initialize a new transaction // NewTransaction initialize a new transaction.
func NewTransaction() *Transaction { func NewTransaction() *Transaction {
return &Transaction{Deltas: make(map[Delta]struct{}, 100)} return &Transaction{Deltas: make(map[Delta]struct{}, 100)}
} }
// AddQuad adds a new quad to the transaction if it is not already present in it // AddQuad adds a new quad to the transaction if it is not already present in it.
// If there is a 'remove' delta for that quad, it will remove that delta from // If there is a 'remove' delta for that quad, it will remove that delta from
// the transaction instead of actually addind the quad // the transaction instead of actually addind the quad.
func (t *Transaction) AddQuad(q quad.Quad) { func (t *Transaction) AddQuad(q quad.Quad) {
ad := Delta{ ad := Delta{
Quad: q, Quad: q,
@ -48,9 +48,9 @@ func (t *Transaction) AddQuad(q quad.Quad) {
} }
} }
// RemoveQuad adds a quad to remove to the transaction // RemoveQuad adds a quad to remove to the transaction.
// The quad will be removed from the database if it is not present in the // The quad will be removed from the database if it is not present in the
// transaction, otherwise it simply remove it from the transaction // transaction, otherwise it simply remove it from the transaction.
func (t *Transaction) RemoveQuad(q quad.Quad) { func (t *Transaction) RemoveQuad(q quad.Quad) {
ad := Delta{ ad := Delta{
Quad: q, Quad: q,

2
graph/transaction_test.go
View file

@ -29,8 +29,8 @@ func TestTransaction(t *testing.T) {
// remove, add -> nothing // remove, add -> nothing
tx = NewTransaction() tx = NewTransaction()
tx.AddQuad(quad.Quad{Subject: "E", Predicate: "follows", Object: "G", Label: ""})
tx.RemoveQuad(quad.Quad{Subject: "E", Predicate: "follows", Object: "G", Label: ""}) tx.RemoveQuad(quad.Quad{Subject: "E", Predicate: "follows", Object: "G", Label: ""})
tx.AddQuad(quad.Quad{Subject: "E", Predicate: "follows", Object: "G", Label: ""})
if len(tx.Deltas) != 0 { if len(tx.Deltas) != 0 {
t.Errorf("Expected [add, remove]->[], have %d delta(s)", len(tx.Deltas)) t.Errorf("Expected [add, remove]->[], have %d delta(s)", len(tx.Deltas))
} }