From e36d94f9330e648b354652401644e1893b9d8525 Mon Sep 17 00:00:00 2001 From: cheliequan <liequanche@126.com> Date: 星期五, 10 二月 2023 17:15:48 +0800 Subject: [PATCH] rollback to slove compile error --- dataprocess.pb.go | 1095 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 536 insertions(+), 559 deletions(-) diff --git a/dataprocess.pb.go b/dataprocess.pb.go index 5981de6..f1edca1 100644 --- a/dataprocess.pb.go +++ b/dataprocess.pb.go @@ -8,7 +8,6 @@ proto "github.com/golang/protobuf/proto" io "io" math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -20,7 +19,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.ProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type TaskBasicInfo struct { CamId string `protobuf:"bytes,1,opt,name=CamId,proto3" json:"CamId,omitempty"` @@ -51,7 +50,7 @@ return xxx_messageInfo_TaskBasicInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -157,7 +156,7 @@ return xxx_messageInfo_RuleParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -233,7 +232,7 @@ return xxx_messageInfo_SoRule.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -341,7 +340,7 @@ return xxx_messageInfo_SoTarget.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -430,7 +429,7 @@ return xxx_messageInfo_SoResult.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -528,7 +527,7 @@ return xxx_messageInfo_EventCache.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -591,7 +590,7 @@ return xxx_messageInfo_TargetCache.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -654,7 +653,7 @@ return xxx_messageInfo_FilterResult.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -778,7 +777,7 @@ func (m *TaskBasicInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -786,90 +785,77 @@ } func (m *TaskBasicInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskBasicInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) + if len(m.CamId) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CamId))) + i += copy(dAtA[i:], m.CamId) } - if len(m.FileId) > 0 { - i -= len(m.FileId) - copy(dAtA[i:], m.FileId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.FileId))) - i-- - dAtA[i] = 0x4a + if len(m.CamName) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CamName))) + i += copy(dAtA[i:], m.CamName) + } + if len(m.TaskID) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.TaskID))) + i += copy(dAtA[i:], m.TaskID) + } + if len(m.TaskName) > 0 { + dAtA[i] = 0x22 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.TaskName))) + i += copy(dAtA[i:], m.TaskName) + } + if len(m.HandleTime) > 0 { + dAtA[i] = 0x2a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.HandleTime))) + i += copy(dAtA[i:], m.HandleTime) + } + if m.ImageId != 0 { + dAtA[i] = 0x30 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) + } + if len(m.ImageTime) > 0 { + dAtA[i] = 0x3a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.ImageTime))) + i += copy(dAtA[i:], m.ImageTime) } if m.IsEndRecord { - i-- + dAtA[i] = 0x40 + i++ if m.IsEndRecord { dAtA[i] = 1 } else { dAtA[i] = 0 } - i-- - dAtA[i] = 0x40 + i++ } - if len(m.ImageTime) > 0 { - i -= len(m.ImageTime) - copy(dAtA[i:], m.ImageTime) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.ImageTime))) - i-- - dAtA[i] = 0x3a + if len(m.FileId) > 0 { + dAtA[i] = 0x4a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.FileId))) + i += copy(dAtA[i:], m.FileId) } - if m.ImageId != 0 { - i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) - i-- - dAtA[i] = 0x30 + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.HandleTime) > 0 { - i -= len(m.HandleTime) - copy(dAtA[i:], m.HandleTime) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.HandleTime))) - i-- - dAtA[i] = 0x2a - } - if len(m.TaskName) > 0 { - i -= len(m.TaskName) - copy(dAtA[i:], m.TaskName) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.TaskName))) - i-- - dAtA[i] = 0x22 - } - if len(m.TaskID) > 0 { - i -= len(m.TaskID) - copy(dAtA[i:], m.TaskID) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.TaskID))) - i-- - dAtA[i] = 0x1a - } - if len(m.CamName) > 0 { - i -= len(m.CamName) - copy(dAtA[i:], m.CamName) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CamName))) - i-- - dAtA[i] = 0x12 - } - if len(m.CamId) > 0 { - i -= len(m.CamId) - copy(dAtA[i:], m.CamId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CamId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil + return i, nil } func (m *RuleParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -877,54 +863,44 @@ } func (m *RuleParams) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RuleParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.SdkArgValue) > 0 { - i -= len(m.SdkArgValue) - copy(dAtA[i:], m.SdkArgValue) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkArgValue))) - i-- - dAtA[i] = 0x22 - } - if len(m.OperatorType) > 0 { - i -= len(m.OperatorType) - copy(dAtA[i:], m.OperatorType) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.OperatorType))) - i-- - dAtA[i] = 0x1a + if len(m.SdkArgAlias) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkArgAlias))) + i += copy(dAtA[i:], m.SdkArgAlias) } if len(m.Operator) > 0 { - i -= len(m.Operator) - copy(dAtA[i:], m.Operator) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Operator))) - i-- dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Operator))) + i += copy(dAtA[i:], m.Operator) } - if len(m.SdkArgAlias) > 0 { - i -= len(m.SdkArgAlias) - copy(dAtA[i:], m.SdkArgAlias) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkArgAlias))) - i-- - dAtA[i] = 0xa + if len(m.OperatorType) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.OperatorType))) + i += copy(dAtA[i:], m.OperatorType) } - return len(dAtA) - i, nil + if len(m.SdkArgValue) > 0 { + dAtA[i] = 0x22 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkArgValue))) + i += copy(dAtA[i:], m.SdkArgValue) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func (m *SoRule) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -932,97 +908,83 @@ } func (m *SoRule) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SoRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Id) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Id))) + i += copy(dAtA[i:], m.Id) } - if len(m.Params) > 0 { - for iNdEx := len(m.Params) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Params[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - } + if len(m.CameraId) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CameraId))) + i += copy(dAtA[i:], m.CameraId) } - if len(m.GroupId) > 0 { - i -= len(m.GroupId) - copy(dAtA[i:], m.GroupId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.GroupId))) - i-- - dAtA[i] = 0x42 + if len(m.PolygonId) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.PolygonId))) + i += copy(dAtA[i:], m.PolygonId) + } + if len(m.SdkId) > 0 { + dAtA[i] = 0x22 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkId))) + i += copy(dAtA[i:], m.SdkId) + } + if m.Sort != 0 { + dAtA[i] = 0x28 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.Sort)) + } + if len(m.RuleWithPre) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.RuleWithPre))) + i += copy(dAtA[i:], m.RuleWithPre) } if m.IsSaveAnyhow { - i-- + dAtA[i] = 0x38 + i++ if m.IsSaveAnyhow { dAtA[i] = 1 } else { dAtA[i] = 0 } - i-- - dAtA[i] = 0x38 + i++ } - if len(m.RuleWithPre) > 0 { - i -= len(m.RuleWithPre) - copy(dAtA[i:], m.RuleWithPre) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.RuleWithPre))) - i-- - dAtA[i] = 0x32 + if len(m.GroupId) > 0 { + dAtA[i] = 0x42 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.GroupId))) + i += copy(dAtA[i:], m.GroupId) } - if m.Sort != 0 { - i = encodeVarintDataprocess(dAtA, i, uint64(m.Sort)) - i-- - dAtA[i] = 0x28 + if len(m.Params) > 0 { + for _, msg := range m.Params { + dAtA[i] = 0x4a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } } - if len(m.SdkId) > 0 { - i -= len(m.SdkId) - copy(dAtA[i:], m.SdkId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkId))) - i-- - dAtA[i] = 0x22 + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.PolygonId) > 0 { - i -= len(m.PolygonId) - copy(dAtA[i:], m.PolygonId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.PolygonId))) - i-- - dAtA[i] = 0x1a - } - if len(m.CameraId) > 0 { - i -= len(m.CameraId) - copy(dAtA[i:], m.CameraId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CameraId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Id) > 0 { - i -= len(m.Id) - copy(dAtA[i:], m.Id) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Id))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil + return i, nil } func (m *SoTarget) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -1030,78 +992,65 @@ } func (m *SoTarget) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SoTarget) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if m.ImageId != 0 { - i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) - i-- - dAtA[i] = 0x30 - } - if len(m.CompDbInfo) > 0 { - for iNdEx := len(m.CompDbInfo) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CompDbInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a + if m.SrcTarget != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.SrcTarget.Size())) + n1, err1 := m.SrcTarget.MarshalTo(dAtA[i:]) + if err1 != nil { + return 0, err1 } - } - if len(m.BelongsTargetID) > 0 { - i -= len(m.BelongsTargetID) - copy(dAtA[i:], m.BelongsTargetID) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.BelongsTargetID))) - i-- - dAtA[i] = 0x22 - } - if len(m.AreaName) > 0 { - i -= len(m.AreaName) - copy(dAtA[i:], m.AreaName) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.AreaName))) - i-- - dAtA[i] = 0x1a + i += n1 } if len(m.AreaId) > 0 { - i -= len(m.AreaId) - copy(dAtA[i:], m.AreaId) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.AreaId))) - i-- dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.AreaId))) + i += copy(dAtA[i:], m.AreaId) } - if m.SrcTarget != nil { - { - size, err := m.SrcTarget.MarshalToSizedBuffer(dAtA[:i]) + if len(m.AreaName) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.AreaName))) + i += copy(dAtA[i:], m.AreaName) + } + if len(m.BelongsTargetID) > 0 { + dAtA[i] = 0x22 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.BelongsTargetID))) + i += copy(dAtA[i:], m.BelongsTargetID) + } + if len(m.CompDbInfo) > 0 { + for _, msg := range m.CompDbInfo { + dAtA[i] = 0x2a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) + i += n } - i-- - dAtA[i] = 0xa } - return len(dAtA) - i, nil + if m.ImageId != 0 { + dAtA[i] = 0x30 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func (m *SoResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -1109,115 +1058,98 @@ } func (m *SoResult) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SoResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.SoType) > 0 { - i -= len(m.SoType) - copy(dAtA[i:], m.SoType) - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SoType))) - i-- - dAtA[i] = 0x42 - } - if m.GroupRule != nil { - { - size, err := m.GroupRule.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - if m.SoRule != nil { - { - size, err := m.SoRule.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - if m.CacheImage != nil { - { - size, err := m.CacheImage.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.FirstImage != nil { - { - size, err := m.FirstImage.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if len(m.Targets) > 0 { - for iNdEx := len(m.Targets) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Targets[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if m.IsEndRecord { - i-- - if m.IsEndRecord { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } if m.IsEvent { - i-- + dAtA[i] = 0x8 + i++ if m.IsEvent { dAtA[i] = 1 } else { dAtA[i] = 0 } - i-- - dAtA[i] = 0x8 + i++ } - return len(dAtA) - i, nil + if m.IsEndRecord { + dAtA[i] = 0x10 + i++ + if m.IsEndRecord { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } + if len(m.Targets) > 0 { + for _, msg := range m.Targets { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if m.FirstImage != nil { + dAtA[i] = 0x22 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.FirstImage.Size())) + n2, err2 := m.FirstImage.MarshalTo(dAtA[i:]) + if err2 != nil { + return 0, err2 + } + i += n2 + } + if m.CacheImage != nil { + dAtA[i] = 0x2a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.CacheImage.Size())) + n3, err3 := m.CacheImage.MarshalTo(dAtA[i:]) + if err3 != nil { + return 0, err3 + } + i += n3 + } + if m.SoRule != nil { + dAtA[i] = 0x32 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.SoRule.Size())) + n4, err4 := m.SoRule.MarshalTo(dAtA[i:]) + if err4 != nil { + return 0, err4 + } + i += n4 + } + if m.GroupRule != nil { + dAtA[i] = 0x3a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.GroupRule.Size())) + n5, err5 := m.GroupRule.MarshalTo(dAtA[i:]) + if err5 != nil { + return 0, err5 + } + i += n5 + } + if len(m.SoType) > 0 { + dAtA[i] = 0x42 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SoType))) + i += copy(dAtA[i:], m.SoType) + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func (m *EventCache) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -1225,100 +1157,102 @@ } func (m *EventCache) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventCache) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Images) > 0 { - for k := range m.Images { - v := m.Images[k] - baseI := i + if len(m.Targets) > 0 { + for k, _ := range m.Targets { + dAtA[i] = 0xa + i++ + v := m.Targets[k] + msgSize := 0 if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) } - i = encodeVarintDataprocess(dAtA, i, uint64(k)) - i-- + mapSize := 1 + sovDataprocess(uint64(k)) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) dAtA[i] = 0x8 - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(k)) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n6, err6 := v.MarshalTo(dAtA[i:]) + if err6 != nil { + return 0, err6 + } + i += n6 + } } } if len(m.RuleGroups) > 0 { - for k := range m.RuleGroups { - v := m.RuleGroups[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- + for k, _ := range m.RuleGroups { dAtA[i] = 0x12 - } - } - if len(m.Targets) > 0 { - for k := range m.Targets { - v := m.Targets[k] - baseI := i + i++ + v := m.RuleGroups[k] + msgSize := 0 if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) } - i = encodeVarintDataprocess(dAtA, i, uint64(k)) - i-- - dAtA[i] = 0x8 - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- + mapSize := 1 + len(k) + sovDataprocess(uint64(len(k))) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) + i += copy(dAtA[i:], k) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n7, err7 := v.MarshalTo(dAtA[i:]) + if err7 != nil { + return 0, err7 + } + i += n7 + } } } - return len(dAtA) - i, nil + if len(m.Images) > 0 { + for k, _ := range m.Images { + dAtA[i] = 0x1a + i++ + v := m.Images[k] + msgSize := 0 + if v != nil { + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) + } + mapSize := 1 + sovDataprocess(uint64(k)) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) + dAtA[i] = 0x8 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(k)) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n8, err8 := v.MarshalTo(dAtA[i:]) + if err8 != nil { + return 0, err8 + } + i += n8 + } + } + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func (m *TargetCache) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -1326,78 +1260,70 @@ } func (m *TargetCache) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TargetCache) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if m.Image != nil { - { - size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) + if len(m.Target) > 0 { + for _, msg := range m.Target { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) + i += n } - i-- - dAtA[i] = 0x1a } if len(m.RuleGroups) > 0 { - for k := range m.RuleGroups { - v := m.RuleGroups[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- + for k, _ := range m.RuleGroups { dAtA[i] = 0x12 - } - } - if len(m.Target) > 0 { - for iNdEx := len(m.Target) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Target[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) + i++ + v := m.RuleGroups[k] + msgSize := 0 + if v != nil { + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) } - i-- + mapSize := 1 + len(k) + sovDataprocess(uint64(len(k))) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) + i += copy(dAtA[i:], k) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n9, err9 := v.MarshalTo(dAtA[i:]) + if err9 != nil { + return 0, err9 + } + i += n9 + } } } - return len(dAtA) - i, nil + if m.Image != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.Image.Size())) + n10, err10 := m.Image.MarshalTo(dAtA[i:]) + if err10 != nil { + return 0, err10 + } + i += n10 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func (m *FilterResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -1405,96 +1331,90 @@ } func (m *FilterResult) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FilterResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Targets) > 0 { - for k := range m.Targets { - v := m.Targets[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1a + if m.BaseInfo != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(m.BaseInfo.Size())) + n11, err11 := m.BaseInfo.MarshalTo(dAtA[i:]) + if err11 != nil { + return 0, err11 } + i += n11 } if len(m.Events) > 0 { - for k := range m.Events { - v := m.Events[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) - i-- + for k, _ := range m.Events { dAtA[i] = 0x12 - } - } - if m.BaseInfo != nil { - { - size, err := m.BaseInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + i++ + v := m.Events[k] + msgSize := 0 + if v != nil { + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) } - i -= size - i = encodeVarintDataprocess(dAtA, i, uint64(size)) + mapSize := 1 + len(k) + sovDataprocess(uint64(len(k))) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) + i += copy(dAtA[i:], k) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n12, err12 := v.MarshalTo(dAtA[i:]) + if err12 != nil { + return 0, err12 + } + i += n12 + } } - i-- - dAtA[i] = 0xa } - return len(dAtA) - i, nil + if len(m.Targets) > 0 { + for k, _ := range m.Targets { + dAtA[i] = 0x1a + i++ + v := m.Targets[k] + msgSize := 0 + if v != nil { + msgSize = v.Size() + msgSize += 1 + sovDataprocess(uint64(msgSize)) + } + mapSize := 1 + len(k) + sovDataprocess(uint64(len(k))) + msgSize + i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) + dAtA[i] = 0xa + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(len(k))) + i += copy(dAtA[i:], k) + if v != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintDataprocess(dAtA, i, uint64(v.Size())) + n13, err13 := v.MarshalTo(dAtA[i:]) + if err13 != nil { + return 0, err13 + } + i += n13 + } + } + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil } func encodeVarintDataprocess(dAtA []byte, offset int, v uint64) int { - offset -= sovDataprocess(v) - base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return base + return offset + 1 } func (m *TaskBasicInfo) Size() (n int) { if m == nil { @@ -1828,7 +1748,14 @@ } func sovDataprocess(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n } func sozDataprocess(x uint64) (n int) { return sovDataprocess(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -2131,7 +2058,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2310,7 +2240,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2626,7 +2559,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2862,7 +2798,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3163,7 +3102,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3312,7 +3254,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3441,7 +3383,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3556,7 +3498,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3573,7 +3515,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3770,7 +3715,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3823,7 +3768,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -4022,7 +3970,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -4151,7 +4099,7 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -4168,7 +4116,10 @@ if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthDataprocess + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -4187,7 +4138,6 @@ func skipDataprocess(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 { @@ -4219,8 +4169,10 @@ break } } + return iNdEx, nil case 1: iNdEx += 8 + return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -4241,30 +4193,55 @@ return 0, ErrInvalidLengthDataprocess } iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDataprocess + if iNdEx < 0 { + return 0, ErrInvalidLengthDataprocess } - depth-- + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowDataprocess + } + 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 := skipDataprocess(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthDataprocess + } + } + 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) } - if iNdEx < 0 { - return 0, ErrInvalidLengthDataprocess - } - if depth == 0 { - return iNdEx, nil - } } - return 0, io.ErrUnexpectedEOF + panic("unreachable") } var ( - ErrInvalidLengthDataprocess = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDataprocess = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDataprocess = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthDataprocess = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowDataprocess = fmt.Errorf("proto: integer overflow") ) -- Gitblit v1.8.0