cleanup old explicit Deletes

Author: steiler

pkg/datastore/transaction_rpc.go

@@ -214,6 +214,8 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 		if err != nil {
 			return nil, err
 		}
+		// clear the owners existing explicit delete entries
+		root.RemoveExplicitDeletes(intent.GetName())
 
 		// store the old intent content in the transaction as the old intent.
 		err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, oldIntentContent.GetFirstPriorityValue(), oldIntentContent)

pkg/tree/intent_path_mapping.go

@@ -25,6 +25,10 @@ func (dp *DeletePathSet) DeepCopy() *DeletePathSet {
 	return result
 }
 
+func (dp *DeletePathSet) RemoveIntentDeletes(intentName string) {
+	delete(dp.data, intentName)
+}
+
 func (dp *DeletePathSet) Add(intentName string, prio int32, pathset *sdcpb.PathSet) {
 	dpp, exists := dp.data[intentName]
 	if !exists {

pkg/tree/root_entry.go

@@ -71,6 +71,10 @@ func (r *RootEntry) DeepCopy(ctx context.Context) (*RootEntry, error) {
 	return result, nil
 }
 
+func (r *RootEntry) RemoveExplicitDeletes(intentName string) {
+	r.explicitDeletes.RemoveIntentDeletes(intentName)
+}
+
 func (r *RootEntry) AddUpdatesRecursive(ctx context.Context, us types.UpdateSlice, flags *types.UpdateInsertFlags) error {
 	var err error
 	for idx, u := range us {