add explicitDeltest to the transaction for rollback

Author: steiler

pkg/datastore/transaction_rpc.go

@@ -53,7 +53,7 @@ func (d *Datastore) SdcpbTransactionIntentToInternalTI(ctx context.Context, req
 	ti.AddUpdates(Updates)
 
 	// add the deletes
-	ti.AddDeletes(req.Deletes)
+	ti.AddExplicitDeletes(req.Deletes)
 
 	return ti, nil
 }
@@ -214,11 +214,11 @@ 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())
+		// clear the owners existing explicit delete entries, retrieving the old entries for storing in the transaction for possible rollback
+		oldExplicitDeletes := 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)
+		err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, oldIntentContent.GetFirstPriorityValue(), oldIntentContent, oldExplicitDeletes)
 		if err != nil {
 			return nil, err
 		}

pkg/datastore/types/transaction.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/sdcio/data-server/pkg/tree"
 	treetypes "github.com/sdcio/data-server/pkg/tree/types"
+	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
 
 type Transaction struct {
@@ -138,7 +139,7 @@ func (t *Transaction) AddTransactionIntent(ti *TransactionIntent, tit Transactio
 }
 
 // AddIntentContent add the content of an intent. If the intent did not exist, add the name of the intent and content == nil.
-func (t *Transaction) AddIntentContent(name string, tit TransactionIntentType, priority int32, content treetypes.UpdateSlice) error {
+func (t *Transaction) AddIntentContent(name string, tit TransactionIntentType, priority int32, content treetypes.UpdateSlice, explicitDeletes *sdcpb.PathSet) error {
 	dstMap := t.getTransactionIntentTypeMap(tit)
 	_, exists := dstMap[name]
 	if exists {
@@ -148,6 +149,7 @@ func (t *Transaction) AddIntentContent(name string, tit TransactionIntentType, p
 	dstMap[name] = ti
 
 	ti.AddUpdates(content)
+	ti.AddExplicitDeletes(explicitDeletes.ToPathSlice())
 	return nil
 }
 

pkg/datastore/types/transaction_intent.go

@@ -17,15 +17,15 @@ type TransactionIntent struct {
 	// it will be stored and used for change calculation but will be excluded when claculating actual deviations.
 	deviation               bool
 	deleteIgnoreNonExisting bool
-	deletes                 *sdcpb.PathSet
+	explicitDeletes         *sdcpb.PathSet
 }
 
 func NewTransactionIntent(name string, priority int32) *TransactionIntent {
 	return &TransactionIntent{
-		name:     name,
-		updates:  make(treetypes.UpdateSlice, 0),
-		priority: priority,
-		deletes:  sdcpb.NewPathSet(),
+		name:            name,
+		updates:         make(treetypes.UpdateSlice, 0),
+		priority:        priority,
+		explicitDeletes: sdcpb.NewPathSet(),
 	}
 }
 
@@ -46,7 +46,7 @@ func (ti *TransactionIntent) GetUpdates() treetypes.UpdateSlice {
 }
 
 func (ti *TransactionIntent) GetDeletes() *sdcpb.PathSet {
-	return ti.deletes
+	return ti.explicitDeletes
 }
 
 func (ti *TransactionIntent) GetOnlyIntended() bool {
@@ -86,8 +86,8 @@ func (ti *TransactionIntent) AddUpdate(u *treetypes.Update) {
 	ti.updates = append(ti.updates, u)
 }
 
-func (ti *TransactionIntent) AddDeletes(p []*sdcpb.Path) {
+func (ti *TransactionIntent) AddExplicitDeletes(p []*sdcpb.Path) {
 	for _, x := range p {
-		ti.deletes.AddPath(x)
+		ti.explicitDeletes.AddPath(x)
 	}
 }

pkg/tree/intent_path_mapping.go

@@ -25,8 +25,13 @@ func (dp *DeletePathSet) DeepCopy() *DeletePathSet {
 	return result
 }
 
-func (dp *DeletePathSet) RemoveIntentDeletes(intentName string) {
-	delete(dp.data, intentName)
+func (dp *DeletePathSet) RemoveIntentDeletes(intentName string) *sdcpb.PathSet {
+	if data, exists := dp.data[intentName]; exists {
+		result := data.GetPathSet()
+		delete(dp.data, intentName)
+		return result
+	}
+	return sdcpb.NewPathSet()
 }
 
 func (dp *DeletePathSet) Add(intentName string, prio int32, pathset *sdcpb.PathSet) {
@@ -79,6 +84,10 @@ func (ddp *DeletePathPrio) DeepCopy() *DeletePathPrio {
 	return result
 }
 
+func (dpp *DeletePathPrio) GetPathSet() *sdcpb.PathSet {
+	return dpp.paths
+}
+
 func (dpp *DeletePathPrio) PathItems() iter.Seq[*sdcpb.Path] {
 	return dpp.paths.Items()
 }

pkg/tree/json.go

@@ -118,7 +118,7 @@ func (s *sharedEntryAttributes) toJsonInternal(onlyNewOrUpdated bool, ietf bool)
 		}
 
 	case *sdcpb.SchemaElem_Leaflist, *sdcpb.SchemaElem_Field:
-		if s.leafVariants.shouldDelete() {
+		if s.leafVariants.canDeleteBranch(false) {
 			return nil, nil
 		}
 		le := s.leafVariants.GetHighestPrecedence(onlyNewOrUpdated, false, false)

pkg/tree/leaf_entry_filter.go

@@ -19,6 +19,10 @@ func FilterDeleted(l *LeafEntry) bool {
 	return l.GetDeleteFlag()
 }
 
+func FilterDeletedNotExplicitDelete(l *LeafEntry) bool {
+	return l.GetDeleteFlag() && !l.GetExplicitDeleteFlag()
+}
+
 // FilterNew Accepts New LeafEntries
 func FilterNew(l *LeafEntry) bool {
 	return l.GetNewFlag()

pkg/tree/root_entry.go

@@ -71,8 +71,8 @@ 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) RemoveExplicitDeletes(intentName string) *sdcpb.PathSet {
+	return r.explicitDeletes.RemoveIntentDeletes(intentName)
 }
 
 func (r *RootEntry) AddUpdatesRecursive(ctx context.Context, us types.UpdateSlice, flags *types.UpdateInsertFlags) error {