Merge pull request #360 from sdcio/updatenilpointer

fix update.path nil pointer

Author: hansthienpondt

pkg/datastore/datastore_rpc.go

@@ -316,7 +316,8 @@ func (d *Datastore) writeToSyncTreeCandidate(ctx context.Context, updates []*sdc
 	// fmt.Println(upds.String())
 	for idx, upd := range upds {
 		_ = idx
-		_, err := d.syncTreeCandidate.AddUpdateRecursive(ctx, upd.Path(), upd, treetypes.NewUpdateInsertFlags())
+
+		_, err := d.syncTreeCandidate.AddUpdateRecursive(ctx, upd.GetPath(), upd.GetUpdate(), treetypes.NewUpdateInsertFlags())
 		if err != nil {
 			return err
 		}

pkg/datastore/transaction_rpc.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 	"time"
 
@@ -214,7 +215,7 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 		lvs := tree.LeafVariantSlice{}
 		lvs = root.GetByOwner(intent.GetName(), lvs)
 
-		oldIntentContent := lvs.ToUpdateSlice()
+		oldIntentContent := lvs.ToPathAndUpdateSlice()
 
 		marksOwnerDeleteVisitor := tree.NewMarkOwnerDeleteVisitor(intent.GetName(), intent.GetOnlyIntended())
 		err := root.Walk(ctx, marksOwnerDeleteVisitor)
@@ -224,8 +225,13 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 		// clear the owners existing explicit delete entries, retrieving the old entries for storing in the transaction for possible rollback
 		oldExplicitDeletes := root.RemoveExplicitDeletes(intent.GetName())
 
+		priority := int32(math.MaxInt32)
+		if len(oldIntentContent) > 0 {
+			priority = oldIntentContent[0].GetUpdate().Priority()
+		}
+
 		// store the old intent content in the transaction as the old intent.
-		err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, oldIntentContent.GetFirstPriorityValue(), oldIntentContent, oldExplicitDeletes)
+		err = transaction.AddIntentContent(intent.GetName(), types.TransactionIntentOld, priority, oldIntentContent, oldExplicitDeletes)
 		if err != nil {
 			return nil, err
 		}
@@ -245,7 +251,7 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 	les := tree.LeafVariantSlice{}
 	les = root.GetByOwner(tree.RunningIntentName, les)
 
-	transaction.GetOldRunning().AddUpdates(les.ToUpdateSlice())
+	transaction.GetOldRunning().AddUpdates(les.ToPathAndUpdateSlice())
 
 	log.V(logf.VDebug).Info("transaction finish tree insertion phase")
 	// FinishInsertion Phase

pkg/datastore/tree_operation_test.go

@@ -140,7 +140,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, explicitDeletes *sdcpb.PathSet) error {
+func (t *Transaction) AddIntentContent(name string, tit TransactionIntentType, priority int32, content []*treetypes.PathAndUpdate, explicitDeletes *sdcpb.PathSet) error {
 	dstMap := t.getTransactionIntentTypeMap(tit)
 	_, exists := dstMap[name]
 	if exists {

pkg/datastore/types/transaction.go

@@ -8,7 +8,7 @@ import (
 type TransactionIntent struct {
 	name string
 	// updates is nil if the intent did not exist.
-	updates treetypes.UpdateSlice
+	updates []*treetypes.PathAndUpdate
 	delete  bool
 	// onlyIntended, the orphan flag, delte only from intended store, but keep in device
 	onlyIntended bool
@@ -23,7 +23,7 @@ type TransactionIntent struct {
 func NewTransactionIntent(name string, priority int32) *TransactionIntent {
 	return &TransactionIntent{
 		name:            name,
-		updates:         make(treetypes.UpdateSlice, 0),
+		updates:         make([]*treetypes.PathAndUpdate, 0),
 		priority:        priority,
 		explicitDeletes: sdcpb.NewPathSet(),
 	}
@@ -37,11 +37,11 @@ func (ti *TransactionIntent) GetPriority() int32 {
 	return ti.priority
 }
 
-func (ti *TransactionIntent) AddUpdates(u treetypes.UpdateSlice) {
+func (ti *TransactionIntent) AddUpdates(u []*treetypes.PathAndUpdate) {
 	ti.updates = append(ti.updates, u...)
 }
 
-func (ti *TransactionIntent) GetUpdates() treetypes.UpdateSlice {
+func (ti *TransactionIntent) GetUpdates() []*treetypes.PathAndUpdate {
 	return ti.updates
 }
 
@@ -83,10 +83,14 @@ func (ti *TransactionIntent) SetDeleteOnlyIntendedFlag() {
 }
 
 func (ti *TransactionIntent) GetPathSet() *sdcpb.PathSet {
-	return ti.updates.ToSdcpbPathSet()
+	result := sdcpb.NewPathSet()
+	for _, upd := range ti.updates {
+		result.AddPath(upd.GetPath())
+	}
+	return result
 }
 
-func (ti *TransactionIntent) AddUpdate(u *treetypes.Update) {
+func (ti *TransactionIntent) AddUpdate(u *treetypes.PathAndUpdate) {
 	ti.updates = append(ti.updates, u)
 }