diff --git a/Makefile b/Makefile index 215bf91..0274f8f 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,14 @@ up: down # Regenerate proto files: protoc: # ^ protoc: LIBS:=$(LIBS),Mpath/to/another/lib + @go mod tidy -v + @go mod vendor + # Install specific version for gogo-proto + @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/gogo/protobuf | xargs go get -v + # Install specific version for protobuf lib + @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/golang/protobuf | xargs go get -v @find . -type f -name '*.proto' -not -path './vendor/*' \ -exec protoc \ - --proto_path=$(GOPATH)/src:. \ + --proto_path=$(GOPATH)/src:./vendor:. \ --gofast_out=plugins=$(LIBS):. '{}' \; diff --git a/aggregator_test.go b/aggregator_test.go index 2bfab9c..35ee955 100644 --- a/aggregator_test.go +++ b/aggregator_test.go @@ -14,8 +14,8 @@ const ( ) func initTestBucket(t *testing.T, b *Bucket) { - require.Nil(t, b.AddBucket("/opt:first", Nodes{{0, 1, 2}, {2, 3, 2}})) - require.Nil(t, b.AddBucket("/opt:second/sub:1", Nodes{{1, 2, 3}, {10, 6, 1}})) + require.Nil(t, b.AddBucket("/opt:first", Nodes{{N: 0, C: 1, P: 2}, {N: 2, C: 3, P: 2}})) + require.Nil(t, b.AddBucket("/opt:second/sub:1", Nodes{{N: 1, C: 2, P: 3}, {N: 10, C: 6, P: 1}})) b.fillNodes() } @@ -37,10 +37,10 @@ func TestNewWeightFunc(t *testing.T) { copy(nodes, b.nodes) expected := Nodes{ - {10, 6, 1}, - {2, 3, 2}, - {1, 2, 3}, - {0, 1, 2}, + {N: 10, C: 6, P: 1}, + {N: 2, C: 3, P: 2}, + {N: 1, C: 2, P: 3}, + {N: 0, C: 1, P: 2}, } sort.Slice(nodes, func(i, j int) bool { return wf(nodes[i]) > wf(nodes[j]) }) diff --git a/cmd/repl/main.go b/cmd/repl/main.go index 2902de6..1d613cd 100644 --- a/cmd/repl/main.go +++ b/cmd/repl/main.go @@ -141,11 +141,11 @@ func read(b *netmap.Bucket, name string) error { if err != nil { return err } - return b.UnmarshalBinary(data) + return b.Unmarshal(data) } func write(b *netmap.Bucket, name string) error { - data, err := b.MarshalBinary() + data, err := b.Marshal() if err != nil { return err } @@ -161,7 +161,7 @@ func getSelection(c *ishell.Context) { return } } - c.Println(nil) + c.Println() } func clearSelection(c *ishell.Context) { diff --git a/examples/demo b/examples/demo index 0b50ba3..f121127 100755 Binary files a/examples/demo and b/examples/demo differ diff --git a/examples/map2 b/examples/map2 index 495950f..fdc9456 100755 Binary files a/examples/map2 and b/examples/map2 differ diff --git a/go.mod b/go.mod index 7a30af4..25ca9ad 100644 --- a/go.mod +++ b/go.mod @@ -10,13 +10,12 @@ require ( github.com/fatih/color v1.7.0 // indirect github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect github.com/gogo/protobuf v1.2.0 - github.com/golang/protobuf v1.2.0 + github.com/golang/protobuf v1.3.1 github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.4 // indirect github.com/nspcc-dev/hrw v1.0.8 github.com/pkg/errors v0.8.0 github.com/stretchr/testify v1.3.0 - golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb // indirect gopkg.in/abiosoft/ishell.v2 v2.0.0 ) diff --git a/go.sum b/go.sum index 4e27bef..f5aa8ed 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWT github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M= github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= @@ -34,8 +34,6 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= gopkg.in/abiosoft/ishell.v2 v2.0.0 h1:/J5yh3nWYSSGFjALcitTI9CLE0Tu27vBYHX0srotqOc= diff --git a/policy.go b/policy.go index 8134c45..2d3975e 100644 --- a/policy.go +++ b/policy.go @@ -1,12 +1,13 @@ package netmap import ( - "bytes" "encoding/binary" "io" "sort" + "strconv" "strings" + rw "github.com/gogo/protobuf/io" "github.com/nspcc-dev/hrw" "github.com/pkg/errors" ) @@ -27,21 +28,6 @@ type ( NodeCount int } - // Bucket represents netmap as graph. - Bucket struct { - Key string - Value string - nodes Nodes - children []Bucket - } - - // Node type represents single graph leaf with index N, capacity C and price P. - Node struct { - N uint32 - C uint64 - P uint64 - } - // Nodes represents slice of graph leafs. Nodes []Node @@ -81,6 +67,13 @@ func (n *Node) Read(r io.Reader) error { } return nil } +func (n Nodes) String() string { + results := make([]string, 0, len(n)) + for i := range n { + results = append(results, strconv.FormatUint(uint64(n[i].N), 10)) + } + return "[" + strings.Join(results, ", ") + "]" +} func (n Nodes) Len() int { return len(n) } func (n Nodes) Less(i, j int) bool { return n[i].N < n[j].N } @@ -270,7 +263,9 @@ func (b Bucket) filterSubtree(filter FilterFunc) *Bucket { } } if len(root.nodes) > 0 { - sort.Sort(root.nodes) + nodes := Nodes(root.nodes) + sort.Sort(nodes) + root.nodes = nodes return &root } return nil @@ -317,7 +312,9 @@ func (b Bucket) getMaxSelectionC(ss []Select, filter FilterFunc, cut bool) (*Buc } if (!cut && count != 0) || count >= ss[0].Count { - sort.Sort(root.nodes) + nodes := Nodes(root.nodes) + sort.Sort(nodes) + root.nodes = nodes return &root, count } @@ -454,7 +451,9 @@ loop: } b.children = append(b.children, c1) } - sort.Sort(b.nodes) + nodes := Nodes(b.nodes) + sort.Sort(nodes) + b.nodes = nodes } // UpdateIndices is auxiliary function used to update @@ -496,88 +495,13 @@ func getChildrenByKey(b Bucket, s Select) []Bucket { // Writes Bucket with this byte structure // [lnName][Name][lnNodes][Node1]...[NodeN][lnSubprops][sub1]...[subN] func (b Bucket) Write(w io.Writer) error { - var err error - - // writing name - if err = binary.Write(w, binary.BigEndian, int32(len(b.Key)+len(b.Value)+1)); err != nil { - return err - } - if err = binary.Write(w, binary.BigEndian, []byte(b.Name())); err != nil { - return err - } - - // writing nodes - if err = b.nodes.Write(w); err != nil { - return err - } - - if err = binary.Write(w, binary.BigEndian, int32(len(b.children))); err != nil { - return err - } - for i := range b.children { - if err = b.children[i].Write(w); err != nil { - return err - } - } - - return nil + return rw.NewDelimitedWriter(w).WriteMsg(&b) } // Read reads Bucket in serialized form: // [lnName][Name][lnNodes][Node1]...[NodeN][lnSubprops][sub1]...[subN] func (b *Bucket) Read(r io.Reader) error { - var ln int32 - var err error - if err = binary.Read(r, binary.BigEndian, &ln); err != nil { - return err - } - name := make([]byte, ln) - lnE, err := r.Read(name) - if err != nil { - return err - } - if int32(lnE) != ln { - return errors.New("unmarshaller error: cannot read name") - } - - b.Key, b.Value, _ = splitKV(string(name)) - - // reading node list - if err = b.nodes.Read(r); err != nil { - return err - } - - if err = binary.Read(r, binary.BigEndian, &ln); err != nil { - return err - } - if ln > 0 { - b.children = make([]Bucket, ln) - for i := range b.children { - if err = b.children[i].Read(r); err != nil { - return err - } - } - } - - return nil -} - -// MarshalBinary implements the encoding.BinaryMarshaler interface. -func (b Bucket) MarshalBinary() ([]byte, error) { - buf := new(bytes.Buffer) - if err := b.Write(buf); err != nil { - return nil, err - } - return buf.Bytes(), nil -} - -// UnmarshalBinary implements the encoding.BinaryUnmarshaler interface. -func (b *Bucket) UnmarshalBinary(data []byte) (err error) { - buf := bytes.NewBuffer(data) - if err = b.Read(buf); err == io.EOF { - return nil - } - return + return rw.NewDelimitedReader(r, 1024*1024).ReadMsg(b) } // Name return b's short string identifier. @@ -613,7 +537,7 @@ func (b Bucket) Children() []Bucket { // AddNode adds node n with options opts to b. func (b *Bucket) AddNode(n uint32, opts ...string) error { - return b.addNode(Node{n, 0, 0}, opts...) + return b.addNode(Node{N: n}, opts...) } // AddStrawNode adds straw node n with options opts to b. diff --git a/policy.pb.go b/policy.pb.go new file mode 100644 index 0000000..6c9bf1a --- /dev/null +++ b/policy.pb.go @@ -0,0 +1,736 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: policy.proto + +package netmap + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" +import _ "github.com/gogo/protobuf/gogoproto" + +import io "io" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + +// Node type represents single graph leaf with index N and weight W. +type Node struct { + N uint32 `protobuf:"varint,1,opt,name=N,proto3" json:"N,omitempty"` + C uint64 `protobuf:"varint,2,opt,name=C,proto3" json:"C,omitempty"` + P uint64 `protobuf:"varint,3,opt,name=P,proto3" json:"P,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Node) Reset() { *m = Node{} } +func (m *Node) String() string { return proto.CompactTextString(m) } +func (*Node) ProtoMessage() {} +func (*Node) Descriptor() ([]byte, []int) { + return fileDescriptor_policy_66a665bf4d785bfa, []int{0} +} +func (m *Node) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Node.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (dst *Node) XXX_Merge(src proto.Message) { + xxx_messageInfo_Node.Merge(dst, src) +} +func (m *Node) XXX_Size() int { + return m.Size() +} +func (m *Node) XXX_DiscardUnknown() { + xxx_messageInfo_Node.DiscardUnknown(m) +} + +var xxx_messageInfo_Node proto.InternalMessageInfo + +func (m *Node) GetN() uint32 { + if m != nil { + return m.N + } + return 0 +} + +func (m *Node) GetC() uint64 { + if m != nil { + return m.C + } + return 0 +} + +func (m *Node) GetP() uint64 { + if m != nil { + return m.P + } + return 0 +} + +// Bucket represents network map as graph. +type Bucket struct { + Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"` + nodes []Node `protobuf:"bytes,3,rep,name=Nodes,proto3" json:"Nodes"` + children []Bucket `protobuf:"bytes,4,rep,name=Children,proto3" json:"Children"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Bucket) Reset() { *m = Bucket{} } +func (m *Bucket) String() string { return proto.CompactTextString(m) } +func (*Bucket) ProtoMessage() {} +func (*Bucket) Descriptor() ([]byte, []int) { + return fileDescriptor_policy_66a665bf4d785bfa, []int{1} +} +func (m *Bucket) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Bucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Bucket.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (dst *Bucket) XXX_Merge(src proto.Message) { + xxx_messageInfo_Bucket.Merge(dst, src) +} +func (m *Bucket) XXX_Size() int { + return m.Size() +} +func (m *Bucket) XXX_DiscardUnknown() { + xxx_messageInfo_Bucket.DiscardUnknown(m) +} + +var xxx_messageInfo_Bucket proto.InternalMessageInfo + +func (m *Bucket) GetKey() string { + if m != nil { + return m.Key + } + return "" +} + +func (m *Bucket) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + +func (m *Bucket) Getnodes() []Node { + if m != nil { + return m.nodes + } + return nil +} + +func (m *Bucket) Getchildren() []Bucket { + if m != nil { + return m.children + } + return nil +} + +func init() { + proto.RegisterType((*Node)(nil), "netmap.Node") + proto.RegisterType((*Bucket)(nil), "netmap.Bucket") +} +func (m *Node) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Node) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.N != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintPolicy(dAtA, i, uint64(m.N)) + } + if m.C != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintPolicy(dAtA, i, uint64(m.C)) + } + if m.P != 0 { + dAtA[i] = 0x18 + i++ + i = encodeVarintPolicy(dAtA, i, uint64(m.P)) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *Bucket) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Bucket) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Key) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintPolicy(dAtA, i, uint64(len(m.Key))) + i += copy(dAtA[i:], m.Key) + } + if len(m.Value) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintPolicy(dAtA, i, uint64(len(m.Value))) + i += copy(dAtA[i:], m.Value) + } + if len(m.nodes) > 0 { + for _, msg := range m.nodes { + dAtA[i] = 0x1a + i++ + i = encodeVarintPolicy(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if len(m.children) > 0 { + for _, msg := range m.children { + dAtA[i] = 0x22 + i++ + i = encodeVarintPolicy(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func encodeVarintPolicy(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *Node) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.N != 0 { + n += 1 + sovPolicy(uint64(m.N)) + } + if m.C != 0 { + n += 1 + sovPolicy(uint64(m.C)) + } + if m.P != 0 { + n += 1 + sovPolicy(uint64(m.P)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *Bucket) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Key) + if l > 0 { + n += 1 + l + sovPolicy(uint64(l)) + } + l = len(m.Value) + if l > 0 { + n += 1 + l + sovPolicy(uint64(l)) + } + if len(m.nodes) > 0 { + for _, e := range m.nodes { + l = e.Size() + n += 1 + l + sovPolicy(uint64(l)) + } + } + if len(m.children) > 0 { + for _, e := range m.children { + l = e.Size() + n += 1 + l + sovPolicy(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovPolicy(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozPolicy(x uint64) (n int) { + return sovPolicy(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Node) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Node: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Node: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field N", wireType) + } + m.N = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.N |= (uint32(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field C", wireType) + } + m.C = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.C |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field P", wireType) + } + m.P = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.P |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipPolicy(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPolicy + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Bucket) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Bucket: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Bucket: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPolicy + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Key = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPolicy + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Value = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field nodes", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPolicy + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.nodes = append(m.nodes, Node{}) + if err := m.nodes[len(m.nodes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field children", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPolicy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPolicy + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.children = append(m.children, Bucket{}) + if err := m.children[len(m.children)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPolicy(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPolicy + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipPolicy(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowPolicy + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowPolicy + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowPolicy + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + iNdEx += length + if length < 0 { + return 0, ErrInvalidLengthPolicy + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowPolicy + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipPolicy(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthPolicy = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPolicy = fmt.Errorf("proto: integer overflow") +) + +func init() { proto.RegisterFile("policy.proto", fileDescriptor_policy_66a665bf4d785bfa) } + +var fileDescriptor_policy_66a665bf4d785bfa = []byte{ + // 250 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0xc8, 0xcf, 0xc9, + 0x4c, 0xae, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0x4b, 0x2d, 0xc9, 0x4d, 0x2c, + 0x90, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, + 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, 0x64, + 0xc0, 0xc5, 0xe2, 0x97, 0x9f, 0x92, 0x2a, 0xc4, 0xc3, 0xc5, 0xe8, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, + 0xc1, 0x1b, 0xc4, 0xe8, 0x07, 0xe2, 0x39, 0x4b, 0x30, 0x29, 0x30, 0x6a, 0xb0, 0x04, 0x31, 0x3a, + 0x83, 0x78, 0x01, 0x12, 0xcc, 0x10, 0x5e, 0x80, 0xd2, 0x42, 0x46, 0x2e, 0x36, 0xa7, 0xd2, 0xe4, + 0xec, 0xd4, 0x12, 0x21, 0x01, 0x2e, 0x66, 0xef, 0xd4, 0x4a, 0xb0, 0x36, 0xce, 0x20, 0x10, 0x53, + 0x48, 0x84, 0x8b, 0x35, 0x2c, 0x31, 0xa7, 0x34, 0x15, 0xac, 0x99, 0x33, 0x08, 0xc2, 0x11, 0x32, + 0xe4, 0x62, 0x05, 0x59, 0x52, 0x2c, 0xc1, 0xac, 0xc0, 0xac, 0xc1, 0x6d, 0xc4, 0xa3, 0x07, 0x71, + 0xab, 0x1e, 0x48, 0xd0, 0x89, 0xf7, 0xc4, 0x3d, 0x79, 0x86, 0x47, 0xf7, 0xe4, 0x59, 0xf3, 0x40, + 0x4a, 0x82, 0x20, 0x2a, 0x85, 0x6c, 0xb8, 0x38, 0x9c, 0x33, 0x32, 0x73, 0x52, 0x8a, 0x52, 0xf3, + 0x24, 0x58, 0xc0, 0xba, 0xf8, 0x60, 0xba, 0x20, 0x96, 0x3b, 0x09, 0x40, 0xf5, 0x71, 0x24, 0x43, + 0xd5, 0x05, 0xc1, 0x75, 0x38, 0x09, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, + 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81, 0xbd, 0x6b, 0x0c, 0x08, 0x00, 0x00, + 0xff, 0xff, 0xad, 0x0f, 0x83, 0x2a, 0x35, 0x01, 0x00, 0x00, +} diff --git a/policy.proto b/policy.proto new file mode 100644 index 0000000..06f9183 --- /dev/null +++ b/policy.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +package netmap; + +// Node type represents single graph leaf with index N and weight W. +message Node { + uint32 N = 1; + uint64 C = 2; + uint64 P = 3; +} + +// Bucket represents network map as graph. +message Bucket { + string Key = 1; + string Value = 2; + repeated Node Nodes = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "nodes"]; + repeated Bucket Children = 4 [(gogoproto.nullable) = false, (gogoproto.customname) = "children"]; +} diff --git a/policy_test.go b/policy_test.go index e263e65..20d68a3 100644 --- a/policy_test.go +++ b/policy_test.go @@ -600,9 +600,9 @@ func TestBucket_MarshalBinary(t *testing.T) { ) require.NoError(t, err) - data, err = before.MarshalBinary() + data, err = before.Marshal() require.NoError(t, err) - err = after.UnmarshalBinary(data) + err = after.Unmarshal(data) require.NoError(t, err) require.Equal(t, before, after) } @@ -972,9 +972,9 @@ func TestBucket_NewOption(t *testing.T) { err = before.AddBucket("/a:b/c:d", nil) require.NoError(t, err) - data, err = before.MarshalBinary() + data, err = before.Marshal() require.NoError(t, err) - err = after.UnmarshalBinary(data) + err = after.Unmarshal(data) require.NoError(t, err) require.Equal(t, before, after) @@ -994,9 +994,9 @@ func TestBucket_MarshalBinaryStress(t *testing.T) { require.NoError(t, err) } - data, err := before.MarshalBinary() + data, err := before.Marshal() require.NoError(t, err) - err = after.UnmarshalBinary(data) + err = after.Unmarshal(data) require.NoError(t, err) require.Equal(t, before, after) } @@ -1018,8 +1018,8 @@ func Benchmark_MarshalStress(b *testing.B) { b.ResetTimer() for i := 0; i < b.N; i++ { - data, _ := before.MarshalBinary() - err := after.UnmarshalBinary(data) + data, _ := before.Marshal() + err := after.Unmarshal(data) if err != nil { b.Fatal(err) } @@ -1133,12 +1133,12 @@ func TestBucket_BigMap(t *testing.T) { root.Copy() t.Logf("Map copy time:\t%s", time.Since(start)) - graph, err := root.MarshalBinary() + graph, err := root.Marshal() require.NoError(t, err) require.Len(t, root.children, locLim+8) newgraph, _ := newRoot() - err = newgraph.UnmarshalBinary(graph) + err = newgraph.Unmarshal(graph) require.NoError(t, err) require.Len(t, newgraph.children, locLim+8) diff --git a/selector.pb.go b/selector.pb.go index 28a5de8..2ecbe69 100644 --- a/selector.pb.go +++ b/selector.pb.go @@ -3,13 +3,12 @@ package netmap -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/golang/protobuf/proto" - io "io" - math "math" -) +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" +import _ "github.com/gogo/protobuf/gogoproto" + +import io "io" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -47,7 +46,6 @@ var Operation_name = map[int32]string{ 7: "OR", 8: "AND", } - var Operation_value = map[string]int32{ "NP": 0, "EQ": 1, @@ -63,9 +61,8 @@ var Operation_value = map[string]int32{ func (x Operation) String() string { return proto.EnumName(Operation_name, int32(x)) } - func (Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{0} + return fileDescriptor_selector_b85c7037d716412c, []int{0} } type Type int32 @@ -79,7 +76,6 @@ var Type_name = map[int32]string{ 0: "String", 1: "Integer", } - var Type_value = map[string]int32{ "String": 0, "Integer": 1, @@ -88,9 +84,8 @@ var Type_value = map[string]int32{ func (x Type) String() string { return proto.EnumName(Type_name, int32(x)) } - func (Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{1} + return fileDescriptor_selector_b85c7037d716412c, []int{1} } type PlacementRule struct { @@ -105,7 +100,7 @@ func (m *PlacementRule) Reset() { *m = PlacementRule{} } func (m *PlacementRule) String() string { return proto.CompactTextString(m) } func (*PlacementRule) ProtoMessage() {} func (*PlacementRule) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{0} + return fileDescriptor_selector_b85c7037d716412c, []int{0} } func (m *PlacementRule) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,8 +117,8 @@ func (m *PlacementRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *PlacementRule) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule.Merge(m, src) +func (dst *PlacementRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementRule.Merge(dst, src) } func (m *PlacementRule) XXX_Size() int { return m.Size() @@ -161,7 +156,7 @@ func (m *SFGroup) Reset() { *m = SFGroup{} } func (m *SFGroup) String() string { return proto.CompactTextString(m) } func (*SFGroup) ProtoMessage() {} func (*SFGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{1} + return fileDescriptor_selector_b85c7037d716412c, []int{1} } func (m *SFGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,8 +173,8 @@ func (m *SFGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *SFGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_SFGroup.Merge(m, src) +func (dst *SFGroup) XXX_Merge(src proto.Message) { + xxx_messageInfo_SFGroup.Merge(dst, src) } func (m *SFGroup) XXX_Size() int { return m.Size() @@ -223,7 +218,7 @@ func (m *Select) Reset() { *m = Select{} } func (m *Select) String() string { return proto.CompactTextString(m) } func (*Select) ProtoMessage() {} func (*Select) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{2} + return fileDescriptor_selector_b85c7037d716412c, []int{2} } func (m *Select) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -240,8 +235,8 @@ func (m *Select) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Select) XXX_Merge(src proto.Message) { - xxx_messageInfo_Select.Merge(m, src) +func (dst *Select) XXX_Merge(src proto.Message) { + xxx_messageInfo_Select.Merge(dst, src) } func (m *Select) XXX_Size() int { return m.Size() @@ -277,7 +272,7 @@ func (m *SimpleFilters) Reset() { *m = SimpleFilters{} } func (m *SimpleFilters) String() string { return proto.CompactTextString(m) } func (*SimpleFilters) ProtoMessage() {} func (*SimpleFilters) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{3} + return fileDescriptor_selector_b85c7037d716412c, []int{3} } func (m *SimpleFilters) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -294,8 +289,8 @@ func (m *SimpleFilters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *SimpleFilters) XXX_Merge(src proto.Message) { - xxx_messageInfo_SimpleFilters.Merge(m, src) +func (dst *SimpleFilters) XXX_Merge(src proto.Message) { + xxx_messageInfo_SimpleFilters.Merge(dst, src) } func (m *SimpleFilters) XXX_Size() int { return m.Size() @@ -328,7 +323,7 @@ func (m *SimpleFilter) Reset() { *m = SimpleFilter{} } func (m *SimpleFilter) String() string { return proto.CompactTextString(m) } func (*SimpleFilter) ProtoMessage() {} func (*SimpleFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{4} + return fileDescriptor_selector_b85c7037d716412c, []int{4} } func (m *SimpleFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -345,8 +340,8 @@ func (m *SimpleFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *SimpleFilter) XXX_Merge(src proto.Message) { - xxx_messageInfo_SimpleFilter.Merge(m, src) +func (dst *SimpleFilter) XXX_Merge(src proto.Message) { + xxx_messageInfo_SimpleFilter.Merge(dst, src) } func (m *SimpleFilter) XXX_Size() int { return m.Size() @@ -483,7 +478,7 @@ func (m *Filter) Reset() { *m = Filter{} } func (m *Filter) String() string { return proto.CompactTextString(m) } func (*Filter) ProtoMessage() {} func (*Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_e4729c7385e2dd96, []int{5} + return fileDescriptor_selector_b85c7037d716412c, []int{5} } func (m *Filter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -500,8 +495,8 @@ func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Filter) XXX_Merge(src proto.Message) { - xxx_messageInfo_Filter.Merge(m, src) +func (dst *Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_Filter.Merge(dst, src) } func (m *Filter) XXX_Size() int { return m.Size() @@ -527,51 +522,15 @@ func (m *Filter) GetF() *SimpleFilter { } func init() { - proto.RegisterEnum("netmap.Operation", Operation_name, Operation_value) - proto.RegisterEnum("netmap.Type", Type_name, Type_value) proto.RegisterType((*PlacementRule)(nil), "netmap.PlacementRule") proto.RegisterType((*SFGroup)(nil), "netmap.SFGroup") proto.RegisterType((*Select)(nil), "netmap.Select") proto.RegisterType((*SimpleFilters)(nil), "netmap.SimpleFilters") proto.RegisterType((*SimpleFilter)(nil), "netmap.SimpleFilter") proto.RegisterType((*Filter)(nil), "netmap.Filter") + proto.RegisterEnum("netmap.Operation", Operation_name, Operation_value) + proto.RegisterEnum("netmap.Type", Type_name, Type_value) } - -func init() { proto.RegisterFile("selector.proto", fileDescriptor_e4729c7385e2dd96) } - -var fileDescriptor_e4729c7385e2dd96 = []byte{ - // 464 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xcd, 0x6e, 0xd3, 0x40, - 0x18, 0xf4, 0xda, 0x89, 0xdd, 0x7c, 0x21, 0x61, 0x59, 0x15, 0x64, 0x71, 0x70, 0x8d, 0x4f, 0x56, - 0xa5, 0xba, 0x10, 0x38, 0x23, 0x35, 0x60, 0x17, 0x04, 0x6a, 0xca, 0x26, 0xe2, 0xee, 0x84, 0xc5, - 0x58, 0x72, 0xbc, 0x2b, 0x7b, 0x2d, 0xd1, 0x1b, 0x37, 0x5e, 0x81, 0x47, 0xea, 0x91, 0x27, 0x40, - 0x28, 0xbc, 0x08, 0xf2, 0xfa, 0x87, 0x28, 0xa2, 0xa7, 0xf1, 0x7c, 0xdf, 0xcc, 0xce, 0x37, 0x92, - 0x61, 0x5a, 0xb2, 0x8c, 0x6d, 0x24, 0x2f, 0x02, 0x51, 0x70, 0xc9, 0x89, 0x99, 0x33, 0xb9, 0x8d, - 0xc5, 0xe3, 0xb3, 0x24, 0x95, 0x5f, 0xaa, 0x75, 0xb0, 0xe1, 0xdb, 0xf3, 0x84, 0x27, 0xfc, 0x5c, - 0xad, 0xd7, 0xd5, 0x67, 0xc5, 0x14, 0x51, 0x5f, 0x8d, 0xcd, 0x5b, 0xc3, 0xe4, 0x3a, 0x8b, 0x37, - 0x6c, 0xcb, 0x72, 0x49, 0xab, 0x8c, 0x11, 0x07, 0x80, 0x32, 0x91, 0x45, 0x71, 0xfd, 0xb6, 0x8d, - 0x5c, 0xe4, 0x4f, 0xe8, 0xde, 0x84, 0x3c, 0x83, 0xa3, 0x65, 0x74, 0x59, 0xf0, 0x4a, 0x94, 0xb6, - 0xee, 0x1a, 0xfe, 0x78, 0x76, 0x3f, 0x68, 0xa2, 0x83, 0x76, 0x3e, 0x1f, 0xdc, 0xfe, 0x3a, 0xd1, - 0x68, 0x2f, 0xf3, 0xbe, 0x23, 0xb0, 0x5a, 0x42, 0x02, 0xb0, 0xa2, 0x34, 0x93, 0xac, 0x28, 0x6d, - 0xa4, 0xdc, 0xd3, 0xce, 0xdd, 0x8c, 0x5b, 0x73, 0x27, 0x22, 0x33, 0x18, 0x2d, 0xdb, 0xa2, 0x5d, - 0x5e, 0xef, 0x68, 0x16, 0xad, 0xe3, 0x9f, 0x8c, 0xd8, 0x60, 0x85, 0x5f, 0x37, 0x59, 0xf5, 0x89, - 0xd9, 0x86, 0x6b, 0xf8, 0x13, 0xda, 0x51, 0xef, 0x29, 0x98, 0x8d, 0x8c, 0x1c, 0xc3, 0xf0, 0x15, - 0xaf, 0x72, 0xd9, 0x36, 0x6c, 0x08, 0xc1, 0x60, 0xbc, 0x63, 0x37, 0xb6, 0xee, 0x22, 0x7f, 0x44, - 0xeb, 0x4f, 0x2f, 0x84, 0xc9, 0x32, 0xdd, 0x8a, 0x8c, 0x75, 0x07, 0xbd, 0x38, 0x2c, 0x70, 0xdc, - 0x9f, 0xb3, 0xa7, 0x3b, 0xa8, 0xe1, 0x7d, 0x43, 0x70, 0x6f, 0x7f, 0x4f, 0x9e, 0x80, 0xbe, 0x10, - 0x2a, 0x7c, 0x3a, 0x7b, 0xd0, 0xbd, 0xb0, 0x10, 0xac, 0x88, 0x65, 0xca, 0x73, 0xaa, 0x2f, 0x04, - 0x79, 0x04, 0xc3, 0x8f, 0x71, 0x56, 0xb1, 0xe6, 0x9c, 0x37, 0x1a, 0x6d, 0x28, 0x39, 0x83, 0x61, - 0x74, 0x51, 0x24, 0xa5, 0x6d, 0xb8, 0xc8, 0x1f, 0xcf, 0x1e, 0xfe, 0x2f, 0xbf, 0xac, 0xe5, 0x4a, - 0x35, 0x37, 0x61, 0x50, 0xa3, 0xf7, 0x12, 0xcc, 0x36, 0xbb, 0x6d, 0x89, 0xfa, 0x96, 0xc4, 0x03, - 0x14, 0xa9, 0x98, 0x3b, 0xea, 0x50, 0x14, 0x9d, 0xae, 0x60, 0xd4, 0xdf, 0x47, 0x4c, 0xd0, 0xaf, - 0xae, 0xb1, 0x56, 0x63, 0xf8, 0x01, 0x23, 0xc5, 0x43, 0xac, 0xd7, 0x78, 0xb9, 0xc2, 0x86, 0xc2, - 0x10, 0x0f, 0x6a, 0x7c, 0xbf, 0xc2, 0x43, 0x85, 0x21, 0x36, 0x6b, 0x5c, 0x50, 0x6c, 0x11, 0x0b, - 0x8c, 0x8b, 0xab, 0xd7, 0xf8, 0xe8, 0xf4, 0x04, 0x06, 0xab, 0x1b, 0xc1, 0x08, 0x80, 0xb9, 0x94, - 0x45, 0x9a, 0x27, 0x58, 0x23, 0x63, 0xb0, 0xde, 0xe6, 0x92, 0x25, 0xac, 0xc0, 0x68, 0x8e, 0x6f, - 0x77, 0x0e, 0xfa, 0xb9, 0x73, 0xd0, 0xef, 0x9d, 0x83, 0x7e, 0xfc, 0x71, 0xb4, 0xb5, 0xa9, 0xfe, - 0xdc, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x59, 0x33, 0x15, 0x02, 0x03, 0x00, 0x00, -} - func (m *PlacementRule) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -758,9 +717,9 @@ func (m *SimpleFilter) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintSelector(dAtA, i, uint64(m.Op)) } if m.Args != nil { - nn3, err3 := m.Args.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + nn3, err := m.Args.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } i += nn3 } @@ -784,9 +743,9 @@ func (m *SimpleFilter_FArgs) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintSelector(dAtA, i, uint64(m.FArgs.Size())) - n4, err4 := m.FArgs.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + n4, err := m.FArgs.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } i += n4 } @@ -817,9 +776,9 @@ func (m *Filter) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintSelector(dAtA, i, uint64(m.F.Size())) - n5, err5 := m.F.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 + n5, err := m.F.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } i += n5 } @@ -1015,7 +974,7 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1043,7 +1002,7 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ReplFactor |= uint32(b&0x7F) << shift + m.ReplFactor |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } @@ -1062,7 +1021,7 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1071,9 +1030,6 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1091,9 +1047,6 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1122,7 +1075,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1150,7 +1103,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1159,9 +1112,6 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1184,7 +1134,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1193,9 +1143,6 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1216,7 +1163,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= uint32(b&0x7F) << shift + v |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } @@ -1233,7 +1180,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - packedLen |= int(b&0x7F) << shift + packedLen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1242,15 +1189,12 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } var elementCount int var count int - for _, integer := range dAtA[iNdEx:postIndex] { + for _, integer := range dAtA { if integer < 128 { count++ } @@ -1270,7 +1214,7 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= uint32(b&0x7F) << shift + v |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } @@ -1289,9 +1233,6 @@ func (m *SFGroup) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1320,7 +1261,7 @@ func (m *Select) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1348,7 +1289,7 @@ func (m *Select) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Count |= uint32(b&0x7F) << shift + m.Count |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } @@ -1367,7 +1308,7 @@ func (m *Select) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1377,9 +1318,6 @@ func (m *Select) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1394,9 +1332,6 @@ func (m *Select) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1425,7 +1360,7 @@ func (m *SimpleFilters) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1453,7 +1388,7 @@ func (m *SimpleFilters) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1462,9 +1397,6 @@ func (m *SimpleFilters) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1482,9 +1414,6 @@ func (m *SimpleFilters) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1513,7 +1442,7 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1541,7 +1470,7 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= Operation(b&0x7F) << shift + m.Op |= (Operation(b) & 0x7F) << shift if b < 0x80 { break } @@ -1560,7 +1489,7 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1570,9 +1499,6 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1592,7 +1518,7 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1601,9 +1527,6 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1622,9 +1545,6 @@ func (m *SimpleFilter) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1653,7 +1573,7 @@ func (m *Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= uint64(b&0x7F) << shift + wire |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1681,7 +1601,7 @@ func (m *Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } @@ -1691,9 +1611,6 @@ func (m *Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1713,7 +1630,7 @@ func (m *Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } @@ -1722,9 +1639,6 @@ func (m *Filter) Unmarshal(dAtA []byte) error { return ErrInvalidLengthSelector } postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSelector - } if postIndex > l { return io.ErrUnexpectedEOF } @@ -1744,9 +1658,6 @@ func (m *Filter) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthSelector } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthSelector - } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -1814,11 +1725,8 @@ func skipSelector(dAtA []byte) (n int, err error) { break } } - if length < 0 { - return 0, ErrInvalidLengthSelector - } iNdEx += length - if iNdEx < 0 { + if length < 0 { return 0, ErrInvalidLengthSelector } return iNdEx, nil @@ -1849,9 +1757,6 @@ func skipSelector(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthSelector - } } return iNdEx, nil case 4: @@ -1870,3 +1775,38 @@ var ( ErrInvalidLengthSelector = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowSelector = fmt.Errorf("proto: integer overflow") ) + +func init() { proto.RegisterFile("selector.proto", fileDescriptor_selector_b85c7037d716412c) } + +var fileDescriptor_selector_b85c7037d716412c = []byte{ + // 464 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xcd, 0x6e, 0xd3, 0x40, + 0x18, 0xf4, 0xda, 0x89, 0xdd, 0x7c, 0x21, 0x61, 0x59, 0x15, 0x64, 0x71, 0x70, 0x8d, 0x4f, 0x56, + 0xa5, 0xba, 0x10, 0x38, 0x23, 0x35, 0x60, 0x17, 0x04, 0x6a, 0xca, 0x26, 0xe2, 0xee, 0x84, 0xc5, + 0x58, 0x72, 0xbc, 0x2b, 0x7b, 0x2d, 0xd1, 0x1b, 0x37, 0x5e, 0x81, 0x47, 0xea, 0x91, 0x27, 0x40, + 0x28, 0xbc, 0x08, 0xf2, 0xfa, 0x87, 0x28, 0xa2, 0xa7, 0xf1, 0x7c, 0xdf, 0xcc, 0xce, 0x37, 0x92, + 0x61, 0x5a, 0xb2, 0x8c, 0x6d, 0x24, 0x2f, 0x02, 0x51, 0x70, 0xc9, 0x89, 0x99, 0x33, 0xb9, 0x8d, + 0xc5, 0xe3, 0xb3, 0x24, 0x95, 0x5f, 0xaa, 0x75, 0xb0, 0xe1, 0xdb, 0xf3, 0x84, 0x27, 0xfc, 0x5c, + 0xad, 0xd7, 0xd5, 0x67, 0xc5, 0x14, 0x51, 0x5f, 0x8d, 0xcd, 0x5b, 0xc3, 0xe4, 0x3a, 0x8b, 0x37, + 0x6c, 0xcb, 0x72, 0x49, 0xab, 0x8c, 0x11, 0x07, 0x80, 0x32, 0x91, 0x45, 0x71, 0xfd, 0xb6, 0x8d, + 0x5c, 0xe4, 0x4f, 0xe8, 0xde, 0x84, 0x3c, 0x83, 0xa3, 0x65, 0x74, 0x59, 0xf0, 0x4a, 0x94, 0xb6, + 0xee, 0x1a, 0xfe, 0x78, 0x76, 0x3f, 0x68, 0xa2, 0x83, 0x76, 0x3e, 0x1f, 0xdc, 0xfe, 0x3a, 0xd1, + 0x68, 0x2f, 0xf3, 0xbe, 0x23, 0xb0, 0x5a, 0x42, 0x02, 0xb0, 0xa2, 0x34, 0x93, 0xac, 0x28, 0x6d, + 0xa4, 0xdc, 0xd3, 0xce, 0xdd, 0x8c, 0x5b, 0x73, 0x27, 0x22, 0x33, 0x18, 0x2d, 0xdb, 0xa2, 0x5d, + 0x5e, 0xef, 0x68, 0x16, 0xad, 0xe3, 0x9f, 0x8c, 0xd8, 0x60, 0x85, 0x5f, 0x37, 0x59, 0xf5, 0x89, + 0xd9, 0x86, 0x6b, 0xf8, 0x13, 0xda, 0x51, 0xef, 0x29, 0x98, 0x8d, 0x8c, 0x1c, 0xc3, 0xf0, 0x15, + 0xaf, 0x72, 0xd9, 0x36, 0x6c, 0x08, 0xc1, 0x60, 0xbc, 0x63, 0x37, 0xb6, 0xee, 0x22, 0x7f, 0x44, + 0xeb, 0x4f, 0x2f, 0x84, 0xc9, 0x32, 0xdd, 0x8a, 0x8c, 0x75, 0x07, 0xbd, 0x38, 0x2c, 0x70, 0xdc, + 0x9f, 0xb3, 0xa7, 0x3b, 0xa8, 0xe1, 0x7d, 0x43, 0x70, 0x6f, 0x7f, 0x4f, 0x9e, 0x80, 0xbe, 0x10, + 0x2a, 0x7c, 0x3a, 0x7b, 0xd0, 0xbd, 0xb0, 0x10, 0xac, 0x88, 0x65, 0xca, 0x73, 0xaa, 0x2f, 0x04, + 0x79, 0x04, 0xc3, 0x8f, 0x71, 0x56, 0xb1, 0xe6, 0x9c, 0x37, 0x1a, 0x6d, 0x28, 0x39, 0x83, 0x61, + 0x74, 0x51, 0x24, 0xa5, 0x6d, 0xb8, 0xc8, 0x1f, 0xcf, 0x1e, 0xfe, 0x2f, 0xbf, 0xac, 0xe5, 0x4a, + 0x35, 0x37, 0x61, 0x50, 0xa3, 0xf7, 0x12, 0xcc, 0x36, 0xbb, 0x6d, 0x89, 0xfa, 0x96, 0xc4, 0x03, + 0x14, 0xa9, 0x98, 0x3b, 0xea, 0x50, 0x14, 0x9d, 0xae, 0x60, 0xd4, 0xdf, 0x47, 0x4c, 0xd0, 0xaf, + 0xae, 0xb1, 0x56, 0x63, 0xf8, 0x01, 0x23, 0xc5, 0x43, 0xac, 0xd7, 0x78, 0xb9, 0xc2, 0x86, 0xc2, + 0x10, 0x0f, 0x6a, 0x7c, 0xbf, 0xc2, 0x43, 0x85, 0x21, 0x36, 0x6b, 0x5c, 0x50, 0x6c, 0x11, 0x0b, + 0x8c, 0x8b, 0xab, 0xd7, 0xf8, 0xe8, 0xf4, 0x04, 0x06, 0xab, 0x1b, 0xc1, 0x08, 0x80, 0xb9, 0x94, + 0x45, 0x9a, 0x27, 0x58, 0x23, 0x63, 0xb0, 0xde, 0xe6, 0x92, 0x25, 0xac, 0xc0, 0x68, 0x8e, 0x6f, + 0x77, 0x0e, 0xfa, 0xb9, 0x73, 0xd0, 0xef, 0x9d, 0x83, 0x7e, 0xfc, 0x71, 0xb4, 0xb5, 0xa9, 0xfe, + 0xdc, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x59, 0x33, 0x15, 0x02, 0x03, 0x00, 0x00, +}