Skip to content

[dotnet-code] Consolidate workflow edge connection construction #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michelle-clayton-work wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[dotnet-code] Consolidate workflow edge connection construction #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions workflow/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,7 @@ func (wb *Builder) AddDirectEdge(source ExecutorBinding, target ExecutorBinding,
if wb.err != nil {
return wb
}
conn := EdgeConnection{
SourceIDs: []string{source.ID},
SinkIDs: []string{target.ID},
}
conn := newEdgeConnection([]string{source.ID}, []string{target.ID})
if condition == nil && slices.ContainsFunc(wb.conditionlessConnections, func(c EdgeConnection) bool {
return conn.Equal(c)
}) {
Expand Down Expand Up @@ -167,10 +164,7 @@ func (wb *Builder) AddFanOutEdge(source ExecutorBinding, targets []ExecutorBindi
}
sinkIDs = append(sinkIDs, target.ID)
}
conn := EdgeConnection{
SourceIDs: []string{source.ID},
SinkIDs: sinkIDs,
}
conn := newEdgeConnection([]string{source.ID}, sinkIDs)
edge := Edge{
Connection: conn,
Index: wb.edgeIdx(),
Expand All @@ -197,11 +191,8 @@ func (wb *Builder) AddFanInBarrierEdge(sources []ExecutorBinding, target Executo
sourceIDs = append(sourceIDs, source.ID)
}
edge := Edge{
Connection: EdgeConnection{
SourceIDs: sourceIDs,
SinkIDs: []string{target.ID},
},
Index: wb.edgeIdx(),
Connection: newEdgeConnection(sourceIDs, []string{target.ID}),
Index: wb.edgeIdx(),
}
applyEdgeOptions(&edge, opts)
for _, id := range sourceIDs {
Expand Down
7 changes: 7 additions & 0 deletions workflow/edge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ type EdgeConnection struct {
SinkIDs []string
}

func newEdgeConnection(sourceIDs []string, sinkIDs []string) EdgeConnection {
return EdgeConnection{
SourceIDs: sourceIDs,
SinkIDs: sinkIDs,
}
}

func (c EdgeConnection) Equal(other EdgeConnection) bool {
return slices.Equal(c.SourceIDs, other.SourceIDs) && slices.Equal(c.SinkIDs, other.SinkIDs)
}
Loading