Make parent entry also an attribute of LeafVariants

Author: steiler

pkg/tree/entry_test.go

@@ -724,7 +724,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// because thats an update.
 	t.Run("Delete Non New",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 2, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 1, owner2, ts), flagsExisting, nil))
@@ -743,7 +743,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// should return nil
 	t.Run("Single entry thats also marked for deletion",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 1, owner1, ts), flagsExisting, nil))
 			lv.les[0].MarkDelete(false)
 
@@ -759,7 +759,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// on onlyIfPrioChanged == true we do not expect output.
 	t.Run("New Low Prio IsUpdate OnlyChanged True",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 5, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 6, owner2, ts), flagsNew, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, RunningValuesPrio, RunningIntentName, ts), flagsExisting, nil))
@@ -776,7 +776,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// on onlyIfPrioChanged == false we do not expect the highes prio update to be returned.
 	t.Run("New Low Prio IsUpdate OnlyChanged False",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 5, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 6, owner1, ts), flagsNew, nil))
 
@@ -792,7 +792,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// // on onlyIfPrioChanged == true we do not expect output.
 	t.Run("New Low Prio IsNew OnlyChanged == True",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 5, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 6, owner2, ts), flagsNew, nil))
@@ -810,7 +810,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// // on onlyIfPrioChanged == true we do not expect output.
 	t.Run("New Low Prio IsNew OnlyChanged == True, with running not existing",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 5, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 6, owner2, ts), flagsNew, nil))
@@ -825,7 +825,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 
 	t.Run("New Low Prio IsNew OnlyChanged == False",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 5, owner1, ts), flagsExisting, nil))
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 6, owner2, ts), flagsNew, nil))
 
@@ -853,7 +853,7 @@ func TestLeafVariants_GetHighesPrio(t *testing.T) {
 	// make sure the secondhighes is also populated if the highes was the first entry
 	t.Run("secondhighes populated if highes was first",
 		func(t *testing.T) {
-			lv := newLeafVariants(&TreeContext{})
+			lv := newLeafVariants(&TreeContext{}, nil)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 1, owner1, ts), flagsExisting, nil))
 			lv.les[0].MarkDelete(false)
 			lv.Add(NewLeafEntry(types.NewUpdate(path, nil, 2, owner2, ts), flagsExisting, nil))

pkg/tree/leaf_variants.go

@@ -11,15 +11,17 @@ import (
 )
 
 type LeafVariants struct {
-	les      []*LeafEntry
-	lesMutex sync.RWMutex
-	tc       *TreeContext
+	les         []*LeafEntry
+	lesMutex    sync.RWMutex
+	tc          *TreeContext
+	parentEntry Entry
 }
 
-func newLeafVariants(tc *TreeContext) *LeafVariants {
+func newLeafVariants(tc *TreeContext, parentEnty Entry) *LeafVariants {
 	return &LeafVariants{
-		les: make([]*LeafEntry, 0, 2),
-		tc:  tc,
+		les:         make([]*LeafEntry, 0, 2),
+		tc:          tc,
+		parentEntry: parentEnty,
 	}
 }
 
@@ -153,9 +155,10 @@ func (lv *LeafVariants) GetHighestPrecedenceValue(filter HighestPrecedenceFilter
 
 func (lv *LeafVariants) DeepCopy(tc *TreeContext, parent Entry) *LeafVariants {
 	result := &LeafVariants{
-		lesMutex: sync.RWMutex{},
-		tc:       tc,
-		les:      make([]*LeafEntry, 0, len(lv.les)),
+		lesMutex:    sync.RWMutex{},
+		tc:          tc,
+		les:         make([]*LeafEntry, 0, len(lv.les)),
+		parentEntry: parent,
 	}
 
 	lv.lesMutex.RLock()
@@ -247,6 +250,8 @@ func (lv *LeafVariants) GetHighestPrecedence(onlyNewOrUpdated bool, includeDefau
 }
 
 func (lv *LeafVariants) highestIsUnequalRunning(highest *LeafEntry) bool {
+	lv.lesMutex.RLock()
+	defer lv.lesMutex.RUnlock()
 	// if highes is already running or even default, return false
 	if highest.Update.Owner() == RunningIntentName {
 		return false
@@ -287,6 +292,8 @@ func (lv *LeafVariants) MarkOwnerForDeletion(owner string, onlyIntended bool) {
 }
 
 func (lv *LeafVariants) DeleteByOwner(owner string) (remainsToExist bool) {
+	lv.lesMutex.Lock()
+	defer lv.lesMutex.Unlock()
 	foundOwner := false
 	for i, l := range lv.les {
 		// early exit if condition is met
@@ -309,18 +316,21 @@ func (lv *LeafVariants) DeleteByOwner(owner string) (remainsToExist bool) {
 }
 
 func (lv *LeafVariants) GetDeviations(ch chan<- *types.DeviationEntry, isActiveCase bool) {
+	lv.lesMutex.RLock()
+	defer lv.lesMutex.RUnlock()
+
 	if len(lv.les) == 0 {
 		return
 	}
 
 	// if it is a presence container that contains childs, skip
-	if lv.les[0].parentEntry.GetSchema().GetContainer().GetIsPresence() && len(lv.les[0].parentEntry.getChildren()) > 0 {
+	if lv.parentEntry.GetSchema().GetContainer().GetIsPresence() && len(lv.parentEntry.getChildren()) > 0 {
 		return
 	}
 
 	// get the path via the first LeafEntry
 	// is valida for all entries
-	sdcpbPath, err := lv.les[0].parentEntry.SdcpbPath()
+	sdcpbPath, err := lv.parentEntry.SdcpbPath()
 	if err != nil {
 		log.Error(err)
 	}

pkg/tree/sharedEntryAttributes.go

@@ -87,9 +87,9 @@ func newSharedEntryAttributes(ctx context.Context, parent Entry, pathElemName st
 		parent:       parent,
 		pathElemName: pathElemName,
 		childs:       newChildMap(),
-		leafVariants: newLeafVariants(tc),
 		treeContext:  tc,
 	}
+	s.leafVariants = newLeafVariants(tc, s)
 
 	// populate the schema
 	err := s.populateSchema(ctx)