make szre deletes are not added altough there is updates in that intent

Author: steiler

pkg/datastore/transaction_rpc.go

@@ -190,12 +190,6 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 		return nil, err
 	}
 
-	// we need to curate a list of all the paths involved, of the old and new intent contents.
-	// this is then used to load the IntendedStore highes prio into the tree, to decide if an update
-	// is to be applied or if a higher precedence update exists and is therefore not applicable. Also if the value got
-	// deleted and a previousely shadowed entry becomes active.
-	involvedPaths := treetypes.NewPathSet()
-
 	// create a flags attribute
 	flagNew := treetypes.NewUpdateInsertFlags()
 	// where the New flag is set
@@ -223,19 +217,16 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 			return nil, err
 		}
 
-		// add the content to the Tree
-		err = root.AddUpdatesRecursive(ctx, intent.GetUpdates(), flagNew)
-		if err != nil {
-			return nil, err
-		}
-
-		// add the explicit delete entries
-		root.AddExplicitDeletes(intent.GetName(), intent.GetPriority(), intent.GetDeletes())
+		if !intent.GetDeleteFlag() {
+			// add the content to the Tree
+			err = root.AddUpdatesRecursive(ctx, intent.GetUpdates(), flagNew)
+			if err != nil {
+				return nil, err
+			}
 
-		// add the old intent contents paths to the involvedPaths slice
-		involvedPaths.Join(oldIntentContent.ToPathSet())
-		// add the new intent contents paths to the involvedPaths slice
-		involvedPaths.Join(intent.GetUpdates().ToPathSet())
+			// add the explicit delete entries
+			root.AddExplicitDeletes(intent.GetName(), intent.GetPriority(), intent.GetDeletes())
+		}
 	}
 
 	les := tree.LeafVariantSlice{}

pkg/datastore/types/transaction_intent.go

@@ -45,6 +45,10 @@ func (ti *TransactionIntent) GetUpdates() treetypes.UpdateSlice {
 	return ti.updates
 }
 
+func (ti *TransactionIntent) GetDeleteFlag() bool {
+	return ti.delete
+}
+
 func (ti *TransactionIntent) GetDeletes() *sdcpb.PathSet {
 	return ti.explicitDeletes
 }

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.canDeleteBranch(false) {
+		if s.leafVariants.canDelete() {
 			return nil, nil
 		}
 		le := s.leafVariants.GetHighestPrecedence(onlyNewOrUpdated, false, false)

pkg/tree/leaf_variants.go

@@ -285,12 +285,12 @@ func (lv *LeafVariants) GetHighestPrecedence(onlyNewOrUpdated bool, includeDefau
 		}
 	}
 
-	// do not include defaults loaded at validation time
-	if checkNotDefaultAllowedButIsDefaultOwner(highest, includeDefaults) {
+	if highest.IsExplicitDelete && !includeExplicitDelete {
 		return nil
 	}
 
-	if highest.IsExplicitDelete && !includeExplicitDelete {
+	// do not include defaults loaded at validation time
+	if checkNotDefaultAllowedButIsDefaultOwner(highest, includeDefaults) {
 		return nil
 	}