Skip to content

Commit 886a4f2

Browse files
Surya-7890Surya-7890
committed
refactor: replace sort.SliceStable with slices.SortStableFunc
This commit replaces all the instances of sort.SliceStable with slices.SortStableFunc. The godocs for sort.SliceStable recommends using slices.SortStableFunc, as it is faster and more efficient.
1 parent 5a98873 commit 886a4f2

File tree

15 files changed

+131
-72
lines changed

15 files changed

+131
-72
lines changed

‎cmd/clusterctl/client/repository/components.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package repository
1818

1919
import (
2020
"fmt"
21-
"sort"
21+
"slices"
2222
"strings"
2323

2424
"github.com/pkg/errors"
@@ -262,17 +262,20 @@ func NewComponents(input ComponentsInput) (Components, error) {
262262
// Deploying cert-manager objects and especially Certificates before Mutating-
263263
// ValidatingWebhookConfigurations and CRDs ensures cert-manager's ca-injector
264264
// receives the event for the objects at the right time to inject the new CA.
265-
sort.SliceStable(objs, func(i, j int) bool {
265+
slices.SortStableFunc(objs, func(i, j unstructured.Unstructured) int {
266266
// First prioritize Namespaces over everything.
267-
if objs[i].GetKind() == "Namespace" {
268-
return true
267+
if i.GetKind() == "Namespace" {
268+
return -1
269269
}
270-
if objs[j].GetKind() == "Namespace" {
271-
return false
270+
if j.GetKind() == "Namespace" {
271+
return 1
272272
}
273273

274274
// Second prioritize cert-manager objects.
275-
return objs[i].GroupVersionKind().Group == "cert-manager.io"
275+
if i.GroupVersionKind().Group == "cert-manager.io" {
276+
return -1
277+
}
278+
return 1
276279
})
277280

278281
return &components{

‎cmd/clusterctl/client/repository/repository_versions.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package repository
1818

1919
import (
2020
"context"
21-
"sort"
21+
"slices"
2222

2323
"github.com/pkg/errors"
2424
"k8s.io/apimachinery/pkg/runtime"
@@ -114,17 +114,20 @@ func latestPatchRelease(ctx context.Context, repo Repository, major, minor *int3
114114
}
115115

116116
// Sort parsed versions by semantic version order.
117-
sort.SliceStable(versionCandidates, func(i, j int) bool {
117+
slices.SortStableFunc(versionCandidates, func(i, j *version.Version) int {
118118
// Prioritize release versions over pre-releases. For example v1.0.0 > v2.0.0-alpha
119119
// If both are pre-releases, sort by semantic version order as usual.
120-
if versionCandidates[j].PreRelease() == "" && versionCandidates[i].PreRelease() != "" {
121-
return false
120+
if j.PreRelease() == "" && i.PreRelease() != "" {
121+
return 1
122122
}
123-
if versionCandidates[i].PreRelease() == "" && versionCandidates[j].PreRelease() != "" {
124-
return true
123+
if i.PreRelease() == "" && j.PreRelease() != "" {
124+
return -1
125125
}
126126

127-
return versionCandidates[j].LessThan(versionCandidates[i])
127+
if j.LessThan(i) {
128+
return -1
129+
}
130+
return 1
128131
})
129132

130133
// Limit the number of searchable versions by 5.

‎controlplane/kubeadm/internal/workload_cluster_conditions.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,9 +1070,12 @@ func aggregateConditionsFromMachinesToKCP(input aggregateConditionsFromMachinesT
10701070
messageIndex = append(messageIndex, m)
10711071
}
10721072

1073-
sort.SliceStable(messageIndex, func(i, j int) bool {
1074-
return len(messageMap[messageIndex[i]]) > len(messageMap[messageIndex[j]]) ||
1075-
(len(messageMap[messageIndex[i]]) == len(messageMap[messageIndex[j]]) && strings.Join(messageMap[messageIndex[i]], ",") < strings.Join(messageMap[messageIndex[j]], ","))
1073+
slices.SortStableFunc(messageIndex, func(i, j string) int {
1074+
if len(messageMap[i]) > len(messageMap[j]) ||
1075+
(len(messageMap[i]) == len(messageMap[j]) && strings.Join(messageMap[i], ",") < strings.Join(messageMap[j], ",")) {
1076+
return -1
1077+
}
1078+
return 1
10761079
})
10771080

10781081
// Build the message

‎internal/controllers/clusterclass/clusterclass_controller.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"reflect"
23-
"sort"
23+
"slices"
2424
"strings"
2525

2626
"github.com/pkg/errors"
@@ -376,8 +376,11 @@ func (r *Reconciler) reconcileVariables(ctx context.Context, s *scope) (ctrl.Res
376376
// Alphabetically sort the variables by name. This ensures no unnecessary updates to the ClusterClass status.
377377
// Note: Definitions in `statusVarList[i].Definitions` have a stable order as they are added in a deterministic order
378378
// and are always held in an array.
379-
sort.SliceStable(statusVarList, func(i, j int) bool {
380-
return statusVarList[i].Name < statusVarList[j].Name
379+
slices.SortStableFunc(statusVarList, func(i, j clusterv1.ClusterClassStatusVariable) int {
380+
if i.Name < j.Name {
381+
return -1
382+
}
383+
return 1
381384
})
382385
clusterClass.Status.Variables = statusVarList
383386

‎internal/controllers/machineset/machineset_controller.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"math"
23-
"sort"
23+
"slices"
2424
"strings"
2525
"time"
2626

@@ -1603,17 +1603,23 @@ func (r *Reconciler) reconcileExternalTemplateReference(ctx context.Context, clu
16031603
// - Machines failing to come up first because
16041604
// there is a chance that they are not hosting any workloads (minimize disruption).
16051605
func sortMachinesToRemediate(machines []*clusterv1.Machine) {
1606-
sort.SliceStable(machines, func(i, j int) bool {
1607-
if annotations.HasRemediateMachine(machines[i]) && !annotations.HasRemediateMachine(machines[j]) {
1608-
return true
1606+
slices.SortStableFunc(machines, func(i, j *clusterv1.Machine) int {
1607+
if annotations.HasRemediateMachine(i) && !annotations.HasRemediateMachine(j) {
1608+
return -1
16091609
}
1610-
if !annotations.HasRemediateMachine(machines[i]) && annotations.HasRemediateMachine(machines[j]) {
1611-
return false
1610+
if !annotations.HasRemediateMachine(i) && annotations.HasRemediateMachine(j) {
1611+
return 1
16121612
}
16131613
// Use newest (and Name) as a tie-breaker criteria.
1614-
if machines[i].CreationTimestamp.Equal(&machines[j].CreationTimestamp) {
1615-
return machines[i].Name < machines[j].Name
1614+
if i.CreationTimestamp.Equal(&j.CreationTimestamp) {
1615+
if i.Name < j.Name {
1616+
return -1
1617+
}
1618+
return 1
1619+
}
1620+
if i.CreationTimestamp.After(j.CreationTimestamp.Time) {
1621+
return -1
16161622
}
1617-
return machines[i].CreationTimestamp.After(machines[j].CreationTimestamp.Time)
1623+
return 1
16181624
})
16191625
}

‎internal/controllers/machineset/machineset_controller_test.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package machineset
1919
import (
2020
"context"
2121
"fmt"
22-
"sort"
22+
"slices"
2323
"strings"
2424
"testing"
2525
"time"
@@ -3122,8 +3122,11 @@ func TestSortMachinesToRemediate(t *testing.T) {
31223122
machines := make([]*clusterv1.Machine, len(unhealthyMachines))
31233123
copy(machines, unhealthyMachines)
31243124
sortMachinesToRemediate(machines)
3125-
sort.SliceStable(unhealthyMachines, func(i, j int) bool {
3126-
return unhealthyMachines[i].CreationTimestamp.After(unhealthyMachines[j].CreationTimestamp.Time)
3125+
slices.SortStableFunc(unhealthyMachines, func(i, j *clusterv1.Machine) int {
3126+
if i.CreationTimestamp.After(j.CreationTimestamp.Time) {
3127+
return -1
3128+
}
3129+
return 1
31273130
})
31283131
g.Expect(unhealthyMachines).To(Equal(machines))
31293132
})
@@ -3136,11 +3139,17 @@ func TestSortMachinesToRemediate(t *testing.T) {
31363139
machines = append(machines, unhealthyMachinesWithAnnotations...)
31373140
sortMachinesToRemediate(machines)
31383141

3139-
sort.SliceStable(unhealthyMachines, func(i, j int) bool {
3140-
return unhealthyMachines[i].CreationTimestamp.After(unhealthyMachines[j].CreationTimestamp.Time)
3142+
slices.SortStableFunc(unhealthyMachines, func(i, j *clusterv1.Machine) int {
3143+
if i.CreationTimestamp.After(j.CreationTimestamp.Time) {
3144+
return -1
3145+
}
3146+
return 1
31413147
})
3142-
sort.SliceStable(unhealthyMachinesWithAnnotations, func(i, j int) bool {
3143-
return unhealthyMachinesWithAnnotations[i].CreationTimestamp.After(unhealthyMachinesWithAnnotations[j].CreationTimestamp.Time)
3148+
slices.SortStableFunc(unhealthyMachinesWithAnnotations, func(i, j *clusterv1.Machine) int {
3149+
if i.CreationTimestamp.After(j.CreationTimestamp.Time) {
3150+
return -1
3151+
}
3152+
return 1
31443153
})
31453154
g.Expect(machines).To(Equal(append(unhealthyMachinesWithAnnotations, unhealthyMachines...)))
31463155
})

‎test/framework/clusterctl/e2e_config.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"regexp"
2828
"runtime"
2929
"slices"
30-
"sort"
3130
"strconv"
3231
"strings"
3332
"time"
@@ -367,17 +366,20 @@ func resolveReleaseMarker(ctx context.Context, releaseMarker string, goproxyClie
367366
}
368367

369368
// Sort parsed versions by semantic version order.
370-
sort.SliceStable(versionCandidates, func(i, j int) bool {
369+
slices.SortStableFunc(versionCandidates, func(i, j semver.Version) int {
371370
// Prioritize pre-release versions over releases. For example v2.0.0-alpha > v1.0.0
372371
// If both are pre-releases, sort by semantic version order as usual.
373-
if len(versionCandidates[i].Pre) == 0 && len(versionCandidates[j].Pre) > 0 {
374-
return false
372+
if len(i.Pre) == 0 && len(j.Pre) > 0 {
373+
return 1
375374
}
376-
if len(versionCandidates[j].Pre) == 0 && len(versionCandidates[i].Pre) > 0 {
377-
return true
375+
if len(j.Pre) == 0 && len(i.Pre) > 0 {
376+
return -1
378377
}
379378

380-
return versionCandidates[j].LT(versionCandidates[i])
379+
if j.LT(i) {
380+
return -1
381+
}
382+
return 1
381383
})
382384

383385
// Limit the number of searchable versions by 5.

‎test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"context"
2222
"fmt"
2323
"math/rand"
24-
"sort"
24+
"slices"
2525

2626
"github.com/blang/semver/v4"
2727
"github.com/pkg/errors"
@@ -340,10 +340,13 @@ func (r *DockerMachinePoolReconciler) propagateMachineDeleteAnnotation(ctx conte
340340
// orderByDeleteMachineAnnotation will sort DockerMachines with the clusterv1.DeleteMachineAnnotation to the front of the list.
341341
// It will preserve the existing order of the list otherwise so that it respects the existing delete priority otherwise.
342342
func orderByDeleteMachineAnnotation(machines []infrav1.DockerMachine) []infrav1.DockerMachine {
343-
sort.SliceStable(machines, func(i, _ int) bool {
344-
_, iHasAnnotation := machines[i].Annotations[clusterv1.DeleteMachineAnnotation]
343+
slices.SortStableFunc(machines, func(i, _ infrav1.DockerMachine) int {
344+
_, iHasAnnotation := i.Annotations[clusterv1.DeleteMachineAnnotation]
345345

346-
return iHasAnnotation
346+
if iHasAnnotation {
347+
return -1
348+
}
349+
return 1
347350
})
348351

349352
return machines

‎util/conditions/merge_strategies.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,14 @@ func sortConditions(conditions []ConditionWithOwnerInfo, orderedConditionTypes [
327327
conditionOrder[conditionType] = i
328328
}
329329

330-
sort.SliceStable(conditions, func(i, j int) bool {
330+
slices.SortStableFunc(conditions, func(i, j ConditionWithOwnerInfo) int {
331331
// Sort by condition order (user defined, useful when computing summary of different conditions from the same object)
332-
return conditionOrder[conditions[i].Type] < conditionOrder[conditions[j].Type] ||
332+
if conditionOrder[i.Type] < conditionOrder[j.Type] ||
333333
// If same condition order, sort by last transition time (useful when computing aggregation of the same conditions from different objects)
334-
(conditionOrder[conditions[i].Type] == conditionOrder[conditions[j].Type] && conditions[i].LastTransitionTime.Before(&conditions[j].LastTransitionTime))
334+
(conditionOrder[i.Type] == conditionOrder[j.Type] && i.LastTransitionTime.Before(&j.LastTransitionTime)) {
335+
return -1
336+
}
337+
return 1
335338
})
336339
}
337340

@@ -463,8 +466,11 @@ func aggregateMessages(conditions []ConditionWithOwnerInfo, n *int, dropEmpty bo
463466
messageIndex = append(messageIndex, m)
464467
}
465468

466-
sort.SliceStable(messageIndex, func(i, j int) bool {
467-
return sortMessage(messageIndex[i], messageIndex[j], messageMustGoFirst, messagePriorityMap, messageObjMapForKind)
469+
slices.SortStableFunc(messageIndex, func(i, j string) int {
470+
if sortMessage(i, j, messageMustGoFirst, messagePriorityMap, messageObjMapForKind) {
471+
return -1
472+
}
473+
return 1
468474
})
469475

470476
// Pick the first n messages, decrement n.

‎util/conditions/patch.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package conditions
1818

1919
import (
2020
"reflect"
21-
"sort"
21+
"slices"
2222

2323
"github.com/google/go-cmp/cmp"
2424
"github.com/pkg/errors"
@@ -217,8 +217,11 @@ func (p Patch) Apply(latest Setter, opts ...PatchApplyOption) error {
217217
}
218218

219219
if applyOpt.conditionSortFunc != nil {
220-
sort.SliceStable(latestConditions, func(i, j int) bool {
221-
return applyOpt.conditionSortFunc(latestConditions[i], latestConditions[j])
220+
slices.SortStableFunc(latestConditions, func(i, j metav1.Condition) int {
221+
if applyOpt.conditionSortFunc(i, j) {
222+
return -1
223+
}
224+
return 1
222225
})
223226
}
224227

0 commit comments

Comments
 (0)