add missing link to process explicit deletes via grpc

Author: steiler

pkg/datastore/transaction_rpc.go

@@ -12,7 +12,6 @@ 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"
 )
@@ -47,9 +46,7 @@ func (d *Datastore) SdcpbTransactionIntentToInternalTI(ctx context.Context, req
 	ti.AddUpdates(Updates)
 
 	// add the deletes
-	for _, d := range req.Deletes {
-		ti.AddDelete(utils.ToStrings(d, false, false))
-	}
+	ti.AddDeletes(req.Deletes)
 
 	return ti, nil
 }
@@ -203,6 +200,9 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 			return nil, err
 		}
 
+		// add the explicit delete entries
+		root.AddExplicitDeletes(intent.GetName(), intent.GetPriority(), intent.GetDeletes())
+
 		// add the old intent contents paths to the involvedPaths slice
 		involvedPaths.Join(oldIntentContent.ToPathSet())
 		// add the new intent contents paths to the involvedPaths slice

pkg/datastore/types/transaction_intent.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	treetypes "github.com/sdcio/data-server/pkg/tree/types"
+	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
 
 type TransactionIntent struct {
@@ -15,15 +16,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                 treetypes.PathSlices
+	deletes                 *sdcpb.PathSet
 }
 
 func NewTransactionIntent(name string, priority int32) *TransactionIntent {
 	return &TransactionIntent{
 		name:     name,
 		updates:  make(treetypes.UpdateSlice, 0),
 		priority: priority,
-		deletes:  make(treetypes.PathSlices, 0),
+		deletes:  sdcpb.NewPathSet(),
 	}
 }
 
@@ -43,7 +44,7 @@ func (ti *TransactionIntent) GetUpdates() treetypes.UpdateSlice {
 	return ti.updates
 }
 
-func (ti *TransactionIntent) GetDeletes() treetypes.PathSlices {
+func (ti *TransactionIntent) GetDeletes() *sdcpb.PathSet {
 	return ti.deletes
 }
 
@@ -67,6 +68,8 @@ 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)
+func (ti *TransactionIntent) AddDeletes(p []*sdcpb.Path) {
+	for _, x := range p {
+		ti.deletes.AddPath(x)
+	}
 }