Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed delete triples bug #75

Merged
merged 1 commit into from
Jun 16, 2017
Merged

Fixed delete triples bug #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bql/planner/planner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ type insertPlan struct {

type updater func(storage.Graph, []*triple.Triple) error

func update(ctx context.Context, stm *semantic.Statement, store storage.Store, f updater) error {
func update(ctx context.Context, stm *semantic.Statement, gbs []string, store storage.Store, f updater) error {
var (
mu sync.Mutex
wg sync.WaitGroup
Expand All @@ -152,7 +152,7 @@ func update(ctx context.Context, stm *semantic.Statement, store storage.Store, f
errs = append(errs, err.Error())
}

for _, graphBinding := range stm.OutputGraphNames() {
for _, graphBinding := range gbs {
wg.Add(1)
go func(graph string) {
defer wg.Done()
Expand Down Expand Up @@ -180,7 +180,7 @@ func (p *insertPlan) Execute(ctx context.Context) (*table.Table, error) {
if err != nil {
return nil, err
}
return t, update(ctx, p.stm, p.store, func(g storage.Graph, d []*triple.Triple) error {
return t, update(ctx, p.stm, p.stm.OutputGraphNames(), p.store, func(g storage.Graph, d []*triple.Triple) error {
trace(p.tracer, func() []string {
return []string{"Inserting triples to graph \"" + g.ID(ctx) + "\""}
})
Expand Down Expand Up @@ -217,7 +217,7 @@ func (p *deletePlan) Execute(ctx context.Context) (*table.Table, error) {
if err != nil {
return nil, err
}
return t, update(ctx, p.stm, p.store, func(g storage.Graph, d []*triple.Triple) error {
return t, update(ctx, p.stm, p.stm.InputGraphNames(), p.store, func(g storage.Graph, d []*triple.Triple) error {
trace(p.tracer, func() []string {
return []string{"Removing triples from graph \"" + g.ID(ctx) + "\""}
})
Expand Down
54 changes: 16 additions & 38 deletions bql/planner/planner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ import (
"github.com/google/badwolf/triple/literal"
)

func insertTest(t *testing.T) {
func insertAndDeleteTest(t *testing.T) {
ctx := context.Background()

// Testing insertion of triples.
bql := `insert data into ?a {/_<foo> "bar"@[] /_<foo> .
/_<foo> "bar"@[] "bar"@[1975-01-01T00:01:01.999999999Z] .
/_<foo> "bar"@[] "yeah"^^type:text};`
Expand Down Expand Up @@ -67,64 +69,40 @@ func insertTest(t *testing.T) {
if i != 3 {
t.Errorf("g.Triples should have returned 3 triples, returned %d instead", i)
}
}

func deleteTest(t *testing.T) {
ctx := context.Background()
bql := `delete data from ?a {/_<foo> "bar"@[] /_<foo> .
/_<foo> "bar"@[] "bar"@[1975-01-01T00:01:01.999999999Z] .
/_<foo> "bar"@[] "yeah"^^type:text};`
p, err := grammar.NewParser(grammar.SemanticBQL())
// Testing deletion of triples.
bql = `delete data from ?a {/_<foo> "bar"@[] /_<foo> .
/_<foo> "bar"@[] "bar"@[1975-01-01T00:01:01.999999999Z] .
/_<foo> "bar"@[] "yeah"^^type:text};`
p, err = grammar.NewParser(grammar.SemanticBQL())
if err != nil {
t.Errorf("grammar.NewParser: should have produced a valid BQL parser, %v", err)
}
stm := &semantic.Statement{}
stm = &semantic.Statement{}
if err = p.Parse(grammar.NewLLk(bql, 1), stm); err != nil {
t.Errorf("Parser.consume: failed to accept BQL %q with error %v", bql, err)
}
pln, err := New(ctx, memory.DefaultStore, stm, 0, nil)
pln, err = New(ctx, memory.DefaultStore, stm, 0, nil)
if err != nil {
t.Errorf("planner.New: should have not failed to create a plan using memory.DefaultStorage for statement %v with error %v", stm, err)
}
if _, err = pln.Execute(ctx); err != nil {
t.Errorf("planner.Execute: failed to execute insert plan with error %v", err)
}
g, err := memory.DefaultStore.Graph(ctx, "?a")
g, err = memory.DefaultStore.Graph(ctx, "?a")
if err != nil {
t.Errorf("memory.DefaultStore.Graph(%q) should have not fail with error %v", "?a", err)
}
i := 0
ts := make(chan *triple.Triple)
if err := g.Triples(ctx, storage.DefaultLookup, ts); err != nil {
i = 0
ts = make(chan *triple.Triple)
if err = g.Triples(ctx, storage.DefaultLookup, ts); err != nil {
t.Error(err)
}
for _ = range ts {
i++
}
if i != 0 {
t.Errorf("g.Triples should have returned 3 triples, returned %d instead", i)
}
}

func TestPlannerInsertDoesNotFail(t *testing.T) {
ctx := context.Background()
if _, err := memory.DefaultStore.NewGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.NewGraph(%q) should have not failed with error %v", "?a", err)
}
insertTest(t)
if err := memory.DefaultStore.DeleteGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.DeleteGraph(%q) should have not failed with error %v", "?a", err)
}
}

func TestPlannerDeleteDoesNotFail(t *testing.T) {
ctx := context.Background()
if _, err := memory.DefaultStore.NewGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.NewGraph(%q) should have not failed with error %v", "?a", err)
}
deleteTest(t)
if err := memory.DefaultStore.DeleteGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.DeleteGraph(%q) should have not failed with error %v", "?a", err)
t.Errorf("g.Triples should have returned 0 triples, returned %d instead", i)
}
}

Expand All @@ -133,7 +111,7 @@ func TestPlannerInsertDeleteDoesNotFail(t *testing.T) {
if _, err := memory.DefaultStore.NewGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.NewGraph(%q) should have not failed with error %v", "?a", err)
}
deleteTest(t)
insertAndDeleteTest(t)
if err := memory.DefaultStore.DeleteGraph(ctx, "?a"); err != nil {
t.Errorf("memory.DefaultStore.DeleteGraph(%q) should have not failed with error %v", "?a", err)
}
Expand Down