update

Author: steiler

pkg/datastore/transaction_rpc.go

@@ -97,7 +97,7 @@ func (d *Datastore) replaceIntent(ctx context.Context, transaction *types.Transa
 	// create a new TreeContext
 	tc := tree.NewTreeContext(treeSCC, d.schemaClient, d.Name())
 	// refresh the Cache content of the treeCacheSchemaClient
-	tc.GetTreeSchemaCacheClient().RefreshCaches(ctx)
+	tc.GetTreeCacheClient().RefreshCaches(ctx)
 
 	// create a new TreeRoot to collect validate and hand to SBI.Set()
 	root, err := tree.NewTreeRoot(ctx, tc)
@@ -109,7 +109,7 @@ func (d *Datastore) replaceIntent(ctx context.Context, transaction *types.Transa
 	tc.SetActualOwner(tree.ReplaceIntentName)
 
 	// store the actual / old running in the transaction
-	runningUpds, err := tc.GetTreeSchemaCacheClient().ReadRunningFull(ctx)
+	runningUpds, err := tc.GetTreeCacheClient().ReadRunningFull(ctx)
 	transaction.GetOldRunning().AddUpdates(runningUpds)
 
 	// creat a InsertFlags struct with the New flag set.
@@ -175,7 +175,7 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 	// create a new TreeContext
 	tc := tree.NewTreeContext(treeSCC, d.schemaClient, d.Name())
 	// refresh the SchemaClientCache
-	tc.GetTreeSchemaCacheClient().RefreshCaches(ctx)
+	tc.GetTreeCacheClient().RefreshCaches(ctx)
 
 	// creat a new TreeRoot
 	root, err := tree.NewTreeRoot(ctx, tc)

pkg/datastore/tree_operation_test.go

@@ -695,6 +695,10 @@ func TestDatastore_populateTree(t *testing.T) {
 				cache.NewUpdate([]string{"choices", "case1", "case-elem", "elem"}, testhelper.GetStringTvProto(t, "case1-content"), prio15, owner1, 0),
 				cache.NewUpdate([]string{"choices", "case1", "log"}, TypedValueFalse, prio15, owner1, 0),
 			},
+			runningStoreUpdates: []*cache.Update{
+				cache.NewUpdate([]string{"choices", "case1", "case-elem", "elem"}, testhelper.GetStringTvProto(t, "case1-content"), tree.RunningValuesPrio, tree.RunningIntentName, 0),
+				cache.NewUpdate([]string{"choices", "case1", "log"}, TypedValueFalse, tree.RunningValuesPrio, tree.RunningIntentName, 0),
+			},
 		},
 		{
 			name:          "ChoiceCase - old highes case",
@@ -724,13 +728,18 @@ func TestDatastore_populateTree(t *testing.T) {
 				cache.NewUpdate([]string{"choices", "case1", "case-elem", "elem"}, testhelper.GetStringTvProto(t, "case1-content"), prio5, owner1, 0),
 				cache.NewUpdate([]string{"choices", "case1", "log"}, TypedValueFalse, prio5, owner1, 0),
 			},
+			runningStoreUpdates: []*cache.Update{
+				cache.NewUpdate([]string{"choices", "case1", "case-elem", "elem"}, testhelper.GetStringTvProto(t, "case1-content"), tree.RunningValuesPrio, tree.RunningIntentName, 0),
+				cache.NewUpdate([]string{"choices", "case1", "log"}, TypedValueFalse, tree.RunningValuesPrio, tree.RunningIntentName, 0),
+			},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// create a gomock controller
 			controller := gomock.NewController(t)
+			defer controller.Finish()
 
 			// create a cache client mock
 			cacheClient := mockcacheclient.NewMockClient(controller)
@@ -820,8 +829,9 @@ func TestDatastore_populateTree(t *testing.T) {
 			if err != nil {
 				t.Error(err)
 			}
-
+			fmt.Println(root.String())
 			root.FinishInsertionPhase(ctx)
+			fmt.Println(root.String())
 
 			validationResult := root.Validate(ctx, false)