Unify script loading

Author: cschleiden

backend/redis/delete.go

@@ -15,7 +15,7 @@ import (
 // KEYS[5] - active-instance-execution key
 // KEYS[6] - instances-by-creation key
 // ARGV[1] - instance segment
-var deleteCmd = redis.NewScript(
+var deleteInstanceCmd = redis.NewScript(
 	`redis.call("DEL", KEYS[1], KEYS[2], KEYS[3], KEYS[4], KEYS[5])
 	return redis.call("ZREM", KEYS[6], ARGV[1])`)
 
@@ -24,7 +24,7 @@ var deleteCmd = redis.NewScript(
 //
 // Note: might want to revisit this in the future if we want to support removing hung instances.
 func (rb *redisBackend) deleteInstance(ctx context.Context, instance *core.WorkflowInstance) error {
-	if err := deleteCmd.Run(ctx, rb.rdb, []string{
+	if err := deleteInstanceCmd.Run(ctx, rb.rdb, []string{
 		rb.keys.instanceKey(instance),
 		rb.keys.pendingEventsKey(instance),
 		rb.keys.historyKey(instance),

backend/redis/redis.go

@@ -63,26 +63,15 @@ func NewRedisBackend(client redis.UniversalClient, opts ...RedisBackendOption) (
 		activityQueue: activityQueue,
 	}
 
-	// Preload scripts here.
-	cmds := map[string]*redis.StringCmd{
-		"deleteInstanceCmd": deleteCmd.Load(ctx, rb.rdb),
-	}
-	for name, cmd := range cmds {
-		// fmt.Println(name, cmd.Val())
-
-		if cmd.Err() != nil {
-			return nil, fmt.Errorf("loading redis script: %v %w", name, cmd.Err())
-		}
-	}
-
 	// Load all Lua scripts
 	cmdMapping := map[string]**redis.Script{
-		"create_workflow_instance.lua": &createWorkflowInstanceCmd,
-		"complete_workflow_task.lua":   &completeWorkflowTaskCmd,
+		"cancel_workflow_instance.lua": &cancelWorkflowInstanceCmd,
 		"complete_activity_task.lua":   &completeActivityTaskCmd,
-		"schedule_future_events.lua":   &futureEventsCmd,
+		"complete_workflow_task.lua":   &completeWorkflowTaskCmd,
+		"create_workflow_instance.lua": &createWorkflowInstanceCmd,
+		"delete_instance.lua":          &deleteInstanceCmd,
 		"expire_workflow_instance.lua": &expireWorkflowInstanceCmd,
-		"cancel_workflow_instance.lua": &cancelWorkflowInstanceCmd,
+		"schedule_future_events.lua":   &futureEventsCmd,
 		"signal_workflow.lua":          &signalWorkflowCmd,
 	}