Merge pull request #326 from cschleiden/remove-history-id

Remove historyId

Author: cschleiden

backend/redis/instance.go

@@ -78,7 +78,7 @@ func (rb *redisBackend) GetWorkflowInstanceHistory(ctx context.Context, instance
 	start := "-"
 
 	if lastSequenceID != nil {
-		start = "(" + historyID(*lastSequenceID)
+		start = fmt.Sprintf("(%d", *lastSequenceID)
 	}
 
 	msgs, err := rb.rdb.XRange(ctx, rb.keys.historyKey(instance), start, "+").Result()

backend/redis/keys.go

@@ -60,10 +60,6 @@ func (k *keys) historyKey(instance *core.WorkflowInstance) string {
 	return fmt.Sprintf("%shistory:%v", k.prefix, instanceSegment(instance))
 }
 
-func historyID(sequenceID int64) string {
-	return fmt.Sprintf("%v-0", sequenceID)
-}
-
 func (k *keys) futureEventsKey() string {
 	return fmt.Sprintf("%sfuture-events", k.prefix)
 }

backend/redis/scripts/complete_workflow_task.lua

@@ -40,13 +40,12 @@ local executedEvents = tonumber(getArgv())
 local lastSequenceId = 0
 for i = 1, executedEvents do
     local eventId = getArgv()
-    local historyId = getArgv()
     local eventData = getArgv()
     local payloadData = getArgv()
     local sequenceId = getArgv()
 
     -- Add event to history
-    redis.call("XADD", historyStreamKey, historyId, "event", eventData)
+    redis.call("XADD", historyStreamKey, sequenceId, "event", eventData)
 
     storePayload(eventId, payloadData)
 

backend/redis/workflow.go

@@ -130,7 +130,7 @@ func (rb *redisBackend) CompleteWorkflowTask(
 			return fmt.Errorf("marshaling event payload: %w", err)
 		}
 
-		args = append(args, event.ID, historyID(event.SequenceID), eventData, payloadData, event.SequenceID)
+		args = append(args, event.ID, eventData, payloadData, event.SequenceID)
 	}
 
 	// Remove executed pending events