forked from TrueCloudLab/frostfs-node
[#1671] Use slices.ContainsFunc()
where possible
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
460e5cbccf
commit
ecb6b0793c
5 changed files with 16 additions and 28 deletions
|
@ -3,6 +3,7 @@ package helper
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"slices"
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
|
||||||
|
@ -118,11 +119,8 @@ func MergeNetmapConfig(roInvoker *invoker.Invoker, md map[string]any) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for k, v := range m {
|
for k, v := range m {
|
||||||
for _, key := range NetmapConfigKeys {
|
if slices.Contains(NetmapConfigKeys, k) {
|
||||||
if k == key {
|
md[k] = v
|
||||||
md[k] = v
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -3,6 +3,7 @@ package network
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"slices"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||||
|
@ -164,10 +165,8 @@ func WriteToNodeInfo(g AddressGroup, ni *netmap.NodeInfo) {
|
||||||
// at least one common address.
|
// at least one common address.
|
||||||
func (x AddressGroup) Intersects(x2 AddressGroup) bool {
|
func (x AddressGroup) Intersects(x2 AddressGroup) bool {
|
||||||
for i := range x {
|
for i := range x {
|
||||||
for j := range x2 {
|
if slices.ContainsFunc(x2, x[i].equal) {
|
||||||
if x[i].equal(x2[j]) {
|
return true
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"crypto/elliptic"
|
"crypto/elliptic"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"slices"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/acl"
|
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/acl"
|
||||||
|
@ -91,13 +92,7 @@ func TestIsVerbCompatible(t *testing.T) {
|
||||||
|
|
||||||
for op, list := range table {
|
for op, list := range table {
|
||||||
for _, verb := range verbs {
|
for _, verb := range verbs {
|
||||||
var contains bool
|
contains := slices.Contains(list, verb)
|
||||||
for _, v := range list {
|
|
||||||
if v == verb {
|
|
||||||
contains = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tok.ForVerb(verb)
|
tok.ForVerb(verb)
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"slices"
|
||||||
"sort"
|
"sort"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
@ -226,10 +227,8 @@ func TestProcessObject(t *testing.T) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, i := range ti.objHolders {
|
if slices.Contains(ti.objHolders, index) {
|
||||||
if index == i {
|
return nil, nil
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil, new(apistatus.ObjectNotFound)
|
return nil, new(apistatus.ObjectNotFound)
|
||||||
}
|
}
|
||||||
|
|
|
@ -345,14 +345,11 @@ func (s *Service) GetNodeByPath(ctx context.Context, req *GetNodeByPathRequest)
|
||||||
} else {
|
} else {
|
||||||
var metaValue []KeyValue
|
var metaValue []KeyValue
|
||||||
for _, kv := range m.Items {
|
for _, kv := range m.Items {
|
||||||
for _, attr := range b.GetAttributes() {
|
if slices.Contains(b.GetAttributes(), kv.Key) {
|
||||||
if kv.Key == attr {
|
metaValue = append(metaValue, KeyValue{
|
||||||
metaValue = append(metaValue, KeyValue{
|
Key: kv.Key,
|
||||||
Key: kv.Key,
|
Value: kv.Value,
|
||||||
Value: kv.Value,
|
})
|
||||||
})
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
x.Meta = metaValue
|
x.Meta = metaValue
|
||||||
|
|
Loading…
Add table
Reference in a new issue