Skip to content
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

Jump to bottom

Reduce redundant walks when resolving module depends_on #35157

Merged
merged 2 commits into from
May 15, 2024
Merged

Reduce redundant walks when resolving module depends_on #35157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3b1586
make Ancestors and Descendents variadic
jbardin May 14, 2024
f41a1fb
walk multiple ancestors at once in ReferenceMap
jbardin May 14, 2024
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
22 changes: 18 additions & 4 deletions internal/dag/dag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,21 @@ func (g *AcyclicGraph) DirectedGraph() Grapher {

// Returns a Set that includes every Vertex yielded by walking down from the
// provided starting Vertex v.
func (g *AcyclicGraph) Ancestors(v Vertex) (Set, error) {
func (g *AcyclicGraph) Ancestors(vs ...Vertex) (Set, error) {
s := make(Set)
memoFunc := func(v Vertex, d int) error {
s.Add(v)
return nil
}

if err := g.DepthFirstWalk(g.downEdgesNoCopy(v), memoFunc); err != nil {
start := make(Set)
for _, v := range vs {
for _, dep := range g.downEdgesNoCopy(v) {
start.Add(dep)
}
}

if err := g.DepthFirstWalk(start, memoFunc); err != nil {
return nil, err
}

Expand All @@ -46,14 +53,21 @@ func (g *AcyclicGraph) Ancestors(v Vertex) (Set, error) {

// Returns a Set that includes every Vertex yielded by walking up from the
// provided starting Vertex v.
func (g *AcyclicGraph) Descendents(v Vertex) (Set, error) {
func (g *AcyclicGraph) Descendents(vs ...Vertex) (Set, error) {
s := make(Set)
memoFunc := func(v Vertex, d int) error {
s.Add(v)
return nil
}

if err := g.ReverseDepthFirstWalk(g.upEdgesNoCopy(v), memoFunc); err != nil {
start := make(Set)
for _, v := range vs {
for _, dep := range g.upEdgesNoCopy(v) {
start.Add(dep)
}
}

if err := g.ReverseDepthFirstWalk(start, memoFunc); err != nil {
return nil, err
}

Expand Down
19 changes: 10 additions & 9 deletions internal/terraform/transform_reference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,17 +437,18 @@ func (m ReferenceMap) parentModuleDependsOn(g *Graph, depender graphNodeDependsO

deps, fromParentModule := m.dependsOn(g, mod)
for _, dep := range deps {
// add the dependency
res = append(res, dep)

// and check any transitive resource dependencies for more resources
ans, _ := g.Ancestors(dep)
for _, v := range ans {
if isDependableResource(v) {
res = append(res, v)
}
if isDependableResource(dep) {
res = append(res, dep)
}
}

ans, _ := g.Ancestors(deps...)
for _, v := range ans {
if isDependableResource(v) {
res = append(res, v)
}
}

fromModule = fromModule || fromParentModule
}

Expand Down
Loading