aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#155] Update neofs-api-go with refactored pkg/netmap

Browse source 
Refactored pkg/netmap package provides JSON converters for
NodeInfo and PlacementPolicy structures, that has been used
by client applications.

It also updates Node structure itself so it is a part of
grpc <-> v2 <-> pkg conversion chain.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-11-05 18:51:43 +03:00 • committed by Alex Vanin
parent 9f8eb0fd51
commit 65be09d3db
16 changed files with 100 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

67
pkg/policy/encode.go
View file

@ -5,7 +5,7 @@ import (
"strconv"
"strings"
"github.com/nspcc-dev/neofs-api-go/v2/netmap"
"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
)
func Encode(p *netmap.PlacementPolicy) []string {
@ -14,9 +14,9 @@ func Encode(p *netmap.PlacementPolicy) []string {
}
var (
replicas = p.GetReplicas()
selectors = p.GetSelectors()
filters = p.GetFilters()
replicas = p.Replicas()
selectors = p.Selectors()
filters = p.Filters()
)
// 1 for container backup factor
@ -26,7 +26,7 @@ func Encode(p *netmap.PlacementPolicy) []string {
encodeReplicas(replicas, &result)
// then backup factor
if backupFactor := p.GetContainerBackupFactor(); backupFactor != 0 {
if backupFactor := p.ContainerBackupFactor(); backupFactor != 0 {
result = append(result, fmt.Sprintf("CBF %d", backupFactor))
}
@ -44,9 +44,9 @@ func encodeReplicas(replicas []*netmap.Replica, dst *[]string) {
for _, replica := range replicas {
builder.WriteString("REP ")
builder.WriteString(strconv.FormatUint(uint64(replica.GetCount()), 10))
builder.WriteString(strconv.FormatUint(uint64(replica.Count()), 10))
if s := replica.GetSelector(); s != "" {
if s := replica.Selector(); s != "" {
builder.WriteString(" IN ")
builder.WriteString(s)
}
@ -61,15 +61,15 @@ func encodeSelectors(selectors []*netmap.Selector, dst *[]string) {
for _, selector := range selectors {
builder.WriteString("SELECT ")
builder.WriteString(strconv.FormatUint(uint64(selector.GetCount()), 10))
builder.WriteString(strconv.FormatUint(uint64(selector.Count()), 10))
if a := selector.GetAttribute(); a != "" {
if a := selector.Attribute(); a != "" {
builder.WriteString(" IN")
switch selector.GetClause() {
case netmap.Same:
switch selector.Clause() {
case netmap.ClauseSame:
builder.WriteString(" SAME ")
case netmap.Distinct:
case netmap.ClauseDistinct:
builder.WriteString(" DISTINCT ")
default:
builder.WriteString(" ")
@ -78,12 +78,12 @@ func encodeSelectors(selectors []*netmap.Selector, dst *[]string) {
builder.WriteString(a)
}
if f := selector.GetFilter(); f != "" {
if f := selector.Filter(); f != "" {
builder.WriteString(" FROM ")
builder.WriteString(f)
}
if n := selector.GetName(); n != "" {
if n := selector.Name(); n != "" {
builder.WriteString(" AS ")
builder.WriteString(n)
}
@ -106,55 +106,32 @@ func encodeFilters(filters []*netmap.Filter, dst *[]string) {
}
}
func operationString(operation netmap.Operation) string {
switch operation {
case netmap.EQ:
return "EQ"
case netmap.NE:
return "NE"
case netmap.GT:
return "GT"
case netmap.GE:
return "GE"
case netmap.LT:
return "LT"
case netmap.LE:
return "LE"
case netmap.OR:
return "OR"
case netmap.AND:
return "AND"
default:
return ""
}
}
func encodeFilter(filter *netmap.Filter) string {
builder := new(strings.Builder)
unspecified := filter.GetOp() == netmap.UnspecifiedOperation
unspecified := filter.Operation() == 0
if k := filter.GetKey(); k != "" {
if k := filter.Key(); k != "" {
builder.WriteString(k)
builder.WriteString(" ")
builder.WriteString(operationString(filter.GetOp()))
builder.WriteString(filter.Operation().String())
builder.WriteString(" ")
builder.WriteString(filter.GetValue())
} else if n := filter.GetName(); unspecified && n != "" {
builder.WriteString(filter.Value())
} else if n := filter.Name(); unspecified && n != "" {
builder.WriteString("@")
builder.WriteString(n)
}
for i, subfilter := range filter.GetFilters() {
for i, subfilter := range filter.InnerFilters() {
if i != 0 {
builder.WriteString(" ")
builder.WriteString(operationString(filter.GetOp()))
builder.WriteString(filter.Operation().String())
builder.WriteString(" ")
}
builder.WriteString(encodeFilter(subfilter))
}
if n := filter.GetName(); n != "" && !unspecified {
if n := filter.Name(); n != "" && !unspecified {
builder.WriteString(" AS ")
builder.WriteString(n)
}