TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 104 Pull requests 13 Projects Releases 2 Activity Actions

cli: Use Cmp() functions for ID-like structs #1646

Open
achuprov wants to merge 1 commit from achuprov/frostfs-node:feat/use_cmp into master
pull from: achuprov/frostfs-node:feat/use_cmp
merge into: TrueCloudLab:master
Conversation 0 Commits 1 Files changed 1 +2 -7
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/frostfs-cli/internal/client/client.go
View file

@ -9,7 +9,6 @@ import (
"io" "io"
"os" "os"
"slices" "slices"
"strings"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
@ -77,9 +76,7 @@ func ListContainers(ctx context.Context, prm ListContainersPrm) (res ListContain
// SortedIDList returns sorted list of identifiers of user's containers. // SortedIDList returns sorted list of identifiers of user's containers.
func (x ListContainersRes) SortedIDList() []cid.ID { func (x ListContainersRes) SortedIDList() []cid.ID {
list := x.cliRes.Containers() list := x.cliRes.Containers()
slices.SortFunc(list, func(lhs, rhs cid.ID) int { slices.SortFunc(list, cid.ID.Cmp)
return strings.Compare(lhs.EncodeToString(), rhs.EncodeToString())
})
return list return list
} }
@ -687,9 +684,7 @@ func SearchObjects(ctx context.Context, prm SearchObjectsPrm) (*SearchObjectsRes
return nil, fmt.Errorf("read object list: %w", err) return nil, fmt.Errorf("read object list: %w", err)
} }
slices.SortFunc(list, func(a, b oid.ID) int { slices.SortFunc(list, oid.ID.Cmp)
return strings.Compare(a.EncodeToString(), b.EncodeToString())
})
return &SearchObjectsRes{ return &SearchObjectsRes{
ids: list, ids: list,