Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
271 changes: 220 additions & 51 deletions mocks/mocktreeentry/entry.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion pkg/datastore/datastore_rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,15 @@ func (d *Datastore) BlameConfig(ctx context.Context, includeDefaults bool) (*sdc
if err != nil {
return nil, err
}

// calculate the Blame
bte, err := root.BlameConfig(includeDefaults)
bcv := tree.NewBlameConfigVisitor(includeDefaults)
err = root.Walk(ctx, bcv)
if err != nil {
return nil, err
}
bte := bcv.GetResult()

// set the root level elements name to the target name
bte.Name = d.config.Name
return bte, nil
Expand Down
6 changes: 5 additions & 1 deletion pkg/datastore/transaction_rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ

oldIntentContent := lvs.ToUpdateSlice()

root.MarkOwnerDelete(intent.GetName(), intent.GetOnlyIntended())
marksOwnerDeleteVisitor := tree.NewMarkOwnerDeleteVisitor(intent.GetName(), intent.GetOnlyIntended())
err := root.Walk(ctx, marksOwnerDeleteVisitor)
if err != nil {
return nil, err
}

// store the old intent content in the transaction as the old intent.
err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, oldIntentContent.GetFirstPriorityValue(), oldIntentContent)
Expand Down
6 changes: 5 additions & 1 deletion pkg/datastore/tree_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,11 @@ func TestDatastore_populateTree(t *testing.T) {
t.Error(err)
}

root.MarkOwnerDelete(tt.intentName, false)
marksOwnerDeleteVisitor := tree.NewMarkOwnerDeleteVisitor(tt.intentName, false)
err = root.Walk(ctx, marksOwnerDeleteVisitor)
if err != nil {
t.Error(err)
}

newFlag := types.NewUpdateInsertFlags().SetNewFlag()

Expand Down
Loading
Loading