package/mq
1
0
Fork 0
mirror of https://github.com/oarkflow/mq.git synced 2025-10-05 16:06:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add task completion

Browse Source
This commit is contained in:
sujit
2024-11-18 14:02:44 +05:45
parent 1c86bec914
commit fa15a45626
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dag/v2/dag.go
View File

@@ -52,6 +52,7 @@ type DAG struct {
taskManager storage.IMap[string, *TaskManager]
finalResult func(taskID string, result Result)
mu sync.Mutex
Error error
}
func NewDAG(finalResultCallback func(taskID string, result Result)) *DAG {
@@ -62,14 +63,22 @@ func NewDAG(finalResultCallback func(taskID string, result Result)) *DAG {
}
}
func (tm *DAG) AddNode(nodeID string, handler func(payload json.RawMessage) Result) {
func (tm *DAG) AddNode(nodeID string, handler func(payload json.RawMessage) Result) *DAG {
if tm.Error != nil {
return tm
}
tm.nodes.Set(nodeID, &Node{ID: nodeID, Handler: handler})
return tm
}
func (tm *DAG) AddEdge(from string, targets ...string) error {
func (tm *DAG) AddEdge(from string, targets ...string) *DAG {
if tm.Error != nil {
return tm
}
node, ok := tm.nodes.Get(from)
if !ok {
return fmt.Errorf("node not found %s", from)
tm.Error = fmt.Errorf("node not found %s", from)
return tm
}
for _, target := range targets {
if targetNode, ok := tm.nodes.Get(target); ok {
@@ -77,7 +86,7 @@ func (tm *DAG) AddEdge(from string, targets ...string) error {
node.Edges = append(node.Edges, edge)
}
}
return nil
return tm
}
func (tm *DAG) GetNextNodes(key string) ([]*Node, error) {
@@ -116,7 +125,6 @@ func (tm *DAG) formHandler(w http.ResponseWriter, r *http.Request) {
taskID := mq.NewID()
manager := NewTaskManager(tm)
tm.taskManager.Set(taskID, manager)
go manager.Run()
payload := fmt.Sprintf(`{"email": "%s", "age": "%s", "gender": "%s"}`, email, age, gender)
manager.Trigger(taskID, "NodeA", json.RawMessage(payload))
http.Redirect(w, r, "/result?taskID="+taskID, http.StatusFound)
@@ -143,9 +151,6 @@ func (tm *DAG) taskStatusHandler(w http.ResponseWriter, r *http.Request) {
}
func (tm *DAG) Start(addr string) {
tm.AddEdge("NodeA", "NodeB")
tm.AddEdge("NodeB", "NodeC")
tm.AddEdge("NodeC", "Result")
http.HandleFunc("/form", tm.formHandler)
http.HandleFunc("/result", tm.resultHandler)
http.HandleFunc("/task-result", tm.taskStatusHandler)

2
dag/v2/task_manager.go
View File

@@ -16,7 +16,6 @@ type TaskState struct {
Timestamp time.Time
Result Result
targetResults storage.IMap[string, Result]
my sync.Mutex
}
type nodeResult struct {
@@ -46,6 +45,7 @@ func NewTaskManager(dag *DAG) *TaskManager {
resultQueue: make(chan nodeResult, 100),
dag: dag,
}
go tm.Run()
go tm.WaitForResult()
return tm
}

6
examples/v2.go
View File

@@ -54,5 +54,11 @@ func main() {
dag.AddNode("NodeB", NodeB)
dag.AddNode("NodeC", NodeC)
dag.AddNode("Result", Result)
dag.AddEdge("NodeA", "NodeB")
dag.AddEdge("NodeB", "NodeC")
dag.AddEdge("NodeC", "Result")
if dag.Error != nil {
panic(dag.Error)
}
dag.Start(":8080")
}