update

Author: steiler

mocks/mockcacheclient/client.go

@@ -12,6 +12,7 @@ import (
 	treeproto "github.com/sdcio/data-server/pkg/tree/importer/proto"
 	"github.com/sdcio/data-server/pkg/tree/tree_persist"
 	treetypes "github.com/sdcio/data-server/pkg/tree/types"
+	"github.com/sdcio/data-server/pkg/utils"
 	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 	log "github.com/sirupsen/logrus"
 )
@@ -45,6 +46,11 @@ func (d *Datastore) SdcpbTransactionIntentToInternalTI(ctx context.Context, req
 	// add the intent to the TransactionIntent
 	ti.AddUpdates(Updates)
 
+	// add the deletes
+	for _, d := range req.Deletes {
+		ti.AddDelete(utils.ToStrings(d, false, false))
+	}
+
 	return ti, nil
 }
 

mocks/mocktreeentry/entry.go

@@ -11,13 +11,19 @@ type TransactionIntent struct {
 	delete       bool
 	onlyIntended bool
 	priority     int32
+	// deviation indicates that the intent is a tolerated deviation.
+	// it will be stored and used for change calculation but will be excluded when claculating actual deviations.
+	deviation               bool
+	deleteIgnoreNonExisting bool
+	deletes                 treetypes.PathSlices
 }
 
 func NewTransactionIntent(name string, priority int32) *TransactionIntent {
 	return &TransactionIntent{
 		name:     name,
 		updates:  make(treetypes.UpdateSlice, 0),
 		priority: priority,
+		deletes:  make(treetypes.PathSlices, 0),
 	}
 }
 
@@ -37,6 +43,10 @@ func (ti *TransactionIntent) GetUpdates() treetypes.UpdateSlice {
 	return ti.updates
 }
 
+func (ti *TransactionIntent) GetDeletes() treetypes.PathSlices {
+	return ti.deletes
+}
+
 func (ti *TransactionIntent) GetOnlyIntended() bool {
 	return ti.onlyIntended
 }
@@ -56,3 +66,7 @@ func (ti *TransactionIntent) GetPathSet() *treetypes.PathSet {
 func (ti *TransactionIntent) AddUpdate(u *treetypes.Update) {
 	ti.updates = append(ti.updates, u)
 }
+
+func (ti *TransactionIntent) AddDelete(p treetypes.PathSlice) {
+	ti.deletes = append(ti.deletes, p)
+}

pkg/datastore/transaction_rpc.go

@@ -158,6 +158,6 @@ type Entry interface {
 }
 
 type EntryVisitor interface {
-	Visit(ctx context.Context, s *sharedEntryAttributes) error
+	Visit(ctx context.Context, e Entry) error
 	Up()
 }

pkg/datastore/types/transaction_intent.go

@@ -19,6 +19,7 @@ type LeafEntry struct {
 	Delete             bool
 	DeleteOnlyIntended bool
 	IsUpdated          bool
+	IsExplicitDelete   bool
 
 	mu sync.RWMutex
 }
@@ -31,6 +32,7 @@ func (l *LeafEntry) DeepCopy(parentEntry Entry) *LeafEntry {
 		Delete:             l.Delete,
 		DeleteOnlyIntended: l.DeleteOnlyIntended,
 		IsUpdated:          l.IsUpdated,
+		IsExplicitDelete:   l.IsExplicitDelete,
 		mu:                 sync.RWMutex{},
 	}
 }
@@ -73,6 +75,12 @@ func (l *LeafEntry) GetDeleteFlag() bool {
 	return l.Delete
 }
 
+func (l *LeafEntry) GetExplicitDeleteFlag() bool {
+	l.mu.RLock()
+	defer l.mu.RUnlock()
+	return l.IsExplicitDelete
+}
+
 func (l *LeafEntry) GetDeleteOnlyIntendedFlag() bool {
 	l.mu.RLock()
 	defer l.mu.RUnlock()
@@ -110,13 +118,9 @@ func (l *LeafEntry) MarkDelete(onlyIntended bool) {
 	l.IsNew = false
 }
 
-func (l *LeafEntry) GetRootBasedEntryChain() []Entry {
-	return l.parentEntry.GetRootBasedEntryChain()
-}
-
 // String returns a string representation of the LeafEntry
 func (l *LeafEntry) String() string {
-	return fmt.Sprintf("Owner: %s, Priority: %d, Value: %s, New: %t, Delete: %t, Update: %t, DeleteIntendedOnly: %t", l.Owner(), l.Priority(), utils.TypedValueToString(l.Value()), l.GetNewFlag(), l.GetDeleteFlag(), l.GetUpdateFlag(), l.GetDeleteOnlyIntendedFlag())
+	return fmt.Sprintf("Owner: %s, Priority: %d, Value: %s, New: %t, Delete: %t, Update: %t, DeleteIntendedOnly: %t, ExplicitDelete: %t", l.Owner(), l.Priority(), utils.TypedValueToString(l.Value()), l.GetNewFlag(), l.GetDeleteFlag(), l.GetUpdateFlag(), l.GetDeleteOnlyIntendedFlag(), l.GetExplicitDeleteFlag())
 }
 
 // NewLeafEntry constructor for a new LeafEntry

pkg/tree/entry.go

@@ -6,9 +6,10 @@ type LeafEntry interface {
 }
 
 type UpdateInsertFlags struct {
-	new          bool
-	delete       bool
-	onlyIntended bool
+	new            bool
+	delete         bool
+	onlyIntended   bool
+	explicitDelete bool
 }
 
 // NewUpdateInsertFlags returns a new *UpdateInsertFlags instance
@@ -17,6 +18,17 @@ func NewUpdateInsertFlags() *UpdateInsertFlags {
 	return &UpdateInsertFlags{}
 }
 
+func (f *UpdateInsertFlags) GetExplicitDeleteFlag() bool {
+	return f.explicitDelete
+}
+
+func (f *UpdateInsertFlags) SetExplicitDeleteFlag() *UpdateInsertFlags {
+	f.explicitDelete = true
+	f.delete = true
+	f.new = false
+	return f
+}
+
 func (f *UpdateInsertFlags) SetDeleteFlag() *UpdateInsertFlags {
 	f.delete = true
 	f.new = false

pkg/tree/leaf_entry.go

@@ -412,11 +412,11 @@ func TestToXMLTable(t *testing.T) {
 				}
 				return upds, nil
 			},
-			expected: ``,
+			expected:               ``,
 			honorNamespace:         true,
 			operationWithNamespace: true,
 			useOperationRemove:     true,
-			newConfig: nil,
+			newConfig:              nil,
 		},
 	}