From 15cf1e16b232f6c1d9c9bbd7166502db01bb581c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Fri, 29 Jul 2016 18:56:06 +0100 Subject: [PATCH] micro optimisation: avoid some unnecessary copying --- report/table.go | 5 +++-- report/topology.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/report/table.go b/report/table.go index 08d3b88f9..10d4aa40c 100644 --- a/report/table.go +++ b/report/table.go @@ -163,9 +163,10 @@ func (t TableTemplates) Merge(other TableTemplates) TableTemplates { } for k, v := range other { if existing, ok := result[k]; ok { - v = v.Merge(existing) + result[k] = v.Merge(existing) + } else { + result[k] = v } - result[k] = v } return result } diff --git a/report/topology.go b/report/topology.go index 5fbe93a4a..f64be7122 100644 --- a/report/topology.go +++ b/report/topology.go @@ -181,9 +181,10 @@ func (n Nodes) Merge(other Nodes) Nodes { } for k, v := range other { if n, ok := cp[k]; ok { // don't overwrite - v = v.Merge(n) + cp[k] = v.Merge(n) + } else { + cp[k] = v } - cp[k] = v } return cp }