From f1eee4a8814b4a4f3f8b06d015f90cef5a3adc67 Mon Sep 17 00:00:00 2001 From: 554325746@qq.com <554325746@qq.com> Date: 星期四, 13 二月 2020 19:56:38 +0800 Subject: [PATCH] mk use gogofaster --- base.pb.go | 144 ++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 82 deletions(-) diff --git a/base.pb.go b/base.pb.go index 2034d85..940f3f4 100644 --- a/base.pb.go +++ b/base.pb.go @@ -8,6 +8,7 @@ proto "github.com/gogo/protobuf/proto" io "io" math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -19,7 +20,7 @@ // 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.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // struct for sdk type Point struct { @@ -41,7 +42,7 @@ return xxx_messageInfo_Point.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -95,7 +96,7 @@ return xxx_messageInfo_Rect.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -167,7 +168,7 @@ func (m *Point) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -175,27 +176,32 @@ } func (m *Point) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Point) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.X != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintBase(dAtA, i, uint64(m.X)) - } if m.Y != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintBase(dAtA, i, uint64(m.Y)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.X != 0 { + i = encodeVarintBase(dAtA, i, uint64(m.X)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *Rect) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -203,41 +209,48 @@ } func (m *Rect) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Rect) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Left != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintBase(dAtA, i, uint64(m.Left)) - } - if m.Top != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintBase(dAtA, i, uint64(m.Top)) + if m.Bottom != 0 { + i = encodeVarintBase(dAtA, i, uint64(m.Bottom)) + i-- + dAtA[i] = 0x20 } if m.Right != 0 { - dAtA[i] = 0x18 - i++ i = encodeVarintBase(dAtA, i, uint64(m.Right)) + i-- + dAtA[i] = 0x18 } - if m.Bottom != 0 { - dAtA[i] = 0x20 - i++ - i = encodeVarintBase(dAtA, i, uint64(m.Bottom)) + if m.Top != 0 { + i = encodeVarintBase(dAtA, i, uint64(m.Top)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.Left != 0 { + i = encodeVarintBase(dAtA, i, uint64(m.Left)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func encodeVarintBase(dAtA []byte, offset int, v uint64) int { + offset -= sovBase(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Point) Size() (n int) { if m == nil { @@ -276,14 +289,7 @@ } func sovBase(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n + return (math_bits.Len64(x|1) + 6) / 7 } func sozBase(x uint64) (n int) { return sovBase(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -511,6 +517,7 @@ func skipBase(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -542,10 +549,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -566,55 +571,30 @@ return 0, ErrInvalidLengthBase } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthBase - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowBase - } - 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 := skipBase(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthBase - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupBase + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthBase + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthBase = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowBase = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthBase = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowBase = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupBase = fmt.Errorf("proto: unexpected end of group") ) -- Gitblit v1.8.0