From 2c6bb12dfefd263d5a14bfc264cc5eecf8002f38 Mon Sep 17 00:00:00 2001 From: zjx-ERROR <158180331@qq.com> Date: Fri, 8 Sep 2023 11:09:01 +0800 Subject: [PATCH] chore: consider perallocating (#1087) * consider perallocating * chore: consider perallocating --- pkg/object/meshcontroller/api/api_customresource.go | 2 +- pkg/object/meshcontroller/api/api_ingress.go | 2 +- pkg/object/meshcontroller/api/api_service.go | 2 +- pkg/object/meshcontroller/api/api_trafficcontrol.go | 4 ++-- pkg/object/meshcontroller/service/service.go | 4 ++-- pkg/tracing/tracing.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/object/meshcontroller/api/api_customresource.go b/pkg/object/meshcontroller/api/api_customresource.go index 6e90367089..e8e41232a7 100644 --- a/pkg/object/meshcontroller/api/api_customresource.go +++ b/pkg/object/meshcontroller/api/api_customresource.go @@ -45,7 +45,7 @@ func (a *API) listCustomResourceKinds(w http.ResponseWriter, r *http.Request) { return kinds[i].Name < kinds[j].Name }) - var pbKinds []*v2alpha1.CustomResourceKind + pbKinds := make([]*v2alpha1.CustomResourceKind, 0, len(kinds)) for _, v := range kinds { kind := &v2alpha1.CustomResourceKind{} err := a.convertSpecToPB(v, kind) diff --git a/pkg/object/meshcontroller/api/api_ingress.go b/pkg/object/meshcontroller/api/api_ingress.go index 10eaaa445c..b784fb0e9c 100644 --- a/pkg/object/meshcontroller/api/api_ingress.go +++ b/pkg/object/meshcontroller/api/api_ingress.go @@ -51,7 +51,7 @@ func (a *API) listIngresses(w http.ResponseWriter, r *http.Request) { specs := a.service.ListIngressSpecs() sort.Sort(ingressesByOrder(specs)) - var apiSpecs []*v2alpha1.Ingress + apiSpecs := make([]*v2alpha1.Ingress, 0, len(specs)) for _, v := range specs { ingress := &v2alpha1.Ingress{} err := a.convertSpecToPB(v, ingress) diff --git a/pkg/object/meshcontroller/api/api_service.go b/pkg/object/meshcontroller/api/api_service.go index 7e2658d000..2320bb9006 100644 --- a/pkg/object/meshcontroller/api/api_service.go +++ b/pkg/object/meshcontroller/api/api_service.go @@ -71,7 +71,7 @@ func (a *API) listServices(w http.ResponseWriter, r *http.Request) { sort.Sort(servicesByOrder(specs)) - var apiSpecs []*v2alpha1.Service + apiSpecs := make([]*v2alpha1.Service, 0, len(specs)) for _, v := range specs { service := &v2alpha1.Service{} err := a.convertSpecToPB(v, service) diff --git a/pkg/object/meshcontroller/api/api_trafficcontrol.go b/pkg/object/meshcontroller/api/api_trafficcontrol.go index 784f4be933..b65477e395 100644 --- a/pkg/object/meshcontroller/api/api_trafficcontrol.go +++ b/pkg/object/meshcontroller/api/api_trafficcontrol.go @@ -35,7 +35,7 @@ func (a *API) listHTTPRouteGroups(w http.ResponseWriter, r *http.Request) { return groups[i].Name < groups[j].Name }) - var pbGroups []*v2alpha1.HTTPRouteGroup + pbGroups := make([]*v2alpha1.HTTPRouteGroup, 0, len(groups)) for _, v := range groups { group := &v2alpha1.HTTPRouteGroup{} err := a.convertSpecToPB(v, group) @@ -141,7 +141,7 @@ func (a *API) listTrafficTargets(w http.ResponseWriter, r *http.Request) { return tts[i].Name < tts[j].Name }) - var pbTrafficTargets []*v2alpha1.TrafficTarget + pbTrafficTargets := make([]*v2alpha1.TrafficTarget, 0, len(tts)) for _, v := range tts { tt := &v2alpha1.TrafficTarget{} err := a.convertSpecToPB(v, tt) diff --git a/pkg/object/meshcontroller/service/service.go b/pkg/object/meshcontroller/service/service.go index 45e5b5326e..ffe65cdb46 100644 --- a/pkg/object/meshcontroller/service/service.go +++ b/pkg/object/meshcontroller/service/service.go @@ -209,12 +209,12 @@ func (s *Service) ListServiceCerts() []*spec.Certificate { // ListAllIngressControllerInstanceCerts gets the ingress controller cert. func (s *Service) ListAllIngressControllerInstanceCerts() []*spec.Certificate { - var certs []*spec.Certificate values, err := s.store.GetPrefix(layout.AllIngressControllerInstanceCertPrefix()) if err != nil { api.ClusterPanic(err) } + certs := make([]*spec.Certificate, 0, len(values)) for _, v := range values { cert := &spec.Certificate{} if err = codectool.Unmarshal([]byte(v), cert); err != nil { @@ -225,7 +225,7 @@ func (s *Service) ListAllIngressControllerInstanceCerts() []*spec.Certificate { certs = append(certs, cert) } - return certs + return certs[:len(certs):len(certs)] } // PutIngressControllerInstanceCert puts the root cert. diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index 77a2fdb1d1..205b7a90d5 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -399,7 +399,7 @@ func (spec *Spec) newBatchSpanProcessors() ([]sdktrace.SpanProcessor, error) { } } - var bsps []sdktrace.SpanProcessor + bsps := make([]sdktrace.SpanProcessor, 0, len(exporters)) for _, exp := range exporters { bsps = append(bsps, sdktrace.NewBatchSpanProcessor(exp, opts...)) }