From 223984986ca8b45e7214a8a53980fc5cc08d2bc8 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Mon, 11 Dec 2023 20:47:41 +0100 Subject: [PATCH] routing: preallocate slices (#2787) Preallocate cases (except in *_test.go) found by https://github.com/alexkohler/prealloc Signed-off-by: Alexander Yastrebov --- routing/datasource.go | 10 +++------- routing/testdataclient/dataclient.go | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/routing/datasource.go b/routing/datasource.go index 6879b96650..68b3ad465d 100644 --- a/routing/datasource.go +++ b/routing/datasource.go @@ -149,11 +149,10 @@ func mergeDefs(defsByClient map[DataClient]routeDefs) []*eskip.Route { } } - var all []*eskip.Route + all := make([]*eskip.Route, 0, len(mergeByID)) for _, def := range mergeByID { all = append(all, def) } - return all } @@ -238,7 +237,7 @@ func createFilter(fr filters.Registry, def *eskip.Filter, cpm map[string]Predica // creates filter instances based on their definition // and the filter registry. func createFilters(fr filters.Registry, defs []*eskip.Filter, cpm map[string]PredicateSpec) ([]*RouteFilter, error) { - var fs []*RouteFilter + fs := make([]*RouteFilter, 0, len(defs)) for i, def := range defs { f, err := createFilter(fr, def, cpm) if err != nil { @@ -246,7 +245,6 @@ func createFilters(fr filters.Registry, defs []*eskip.Filter, cpm map[string]Pre } fs = append(fs, &RouteFilter{f, def.Name, i}) } - return fs, nil } @@ -272,16 +270,14 @@ func getFreeStringArgs(count int, p *eskip.Predicate) ([]string, error) { ) } - var a []string + a := make([]string, 0, len(p.Args)) for i := range p.Args { s, ok := p.Args[i].(string) if !ok { return nil, fmt.Errorf("expected argument of type string, %s", p.Name) } - a = append(a, s) } - return a, nil } diff --git a/routing/testdataclient/dataclient.go b/routing/testdataclient/dataclient.go index 3f80310d4b..da52e37861 100644 --- a/routing/testdataclient/dataclient.go +++ b/routing/testdataclient/dataclient.go @@ -61,11 +61,10 @@ func (c *Client) LoadAll() ([]*eskip.Route, error) { return nil, errors.New("failed to get routes") } - var routes []*eskip.Route + routes := make([]*eskip.Route, 0, len(c.routes)) for _, r := range c.routes { routes = append(routes, r) } - return routes, nil }