github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-01 23:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement a Merge function on IDLists which is more efficient than repeated Add

Browse Source
This commit is contained in:
Bryan Boreham
2015-07-07 21:59:39 +01:00
parent 76d658b193
commit baf0d94af9
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render/render.go
View File

@@ -85,7 +85,7 @@ func (m Map) render(rpt report.Report) (RenderableNodes, map[string]string) {
output[outRenderable.ID] = outRenderable
mapped[inRenderable.ID] = outRenderable.ID
adjacencies[outRenderable.ID] = adjacencies[outRenderable.ID].Add(inRenderable.Adjacency...)
adjacencies[outRenderable.ID] = adjacencies[outRenderable.ID].Merge(inRenderable.Adjacency)
}
// Rewrite Adjacency for new node IDs.

4
render/renderable_node.go
View File

@@ -53,8 +53,8 @@ func (rn *RenderableNode) Merge(other RenderableNode) {
panic(rn.ID)
}
rn.Adjacency = rn.Adjacency.Add(other.Adjacency...)
rn.Origins = rn.Origins.Add(other.Origins...)
rn.Adjacency = rn.Adjacency.Merge(other.Adjacency)
rn.Origins = rn.Origins.Merge(other.Origins)
rn.AggregateMetadata.Merge(other.AggregateMetadata)
rn.NodeMetadata.Merge(other.NodeMetadata)