From 54747b4c57f1c44b5c973ad585768c83049429de Mon Sep 17 00:00:00 2001 From: cheliequan <liequanche@126.com> Date: 星期五, 10 二月 2023 16:56:08 +0800 Subject: [PATCH] 更新gofast版本使用protobufV3 --- dataprocess.pb.go | 1247 ++++++++++++++++++++++++++++++----------------------------- dataprocess.proto | 6 2 files changed, 638 insertions(+), 615 deletions(-) diff --git a/dataprocess.pb.go b/dataprocess.pb.go index 7856a69..5981de6 100644 --- a/dataprocess.pb.go +++ b/dataprocess.pb.go @@ -8,6 +8,7 @@ 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. @@ -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.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type TaskBasicInfo struct { CamId string `protobuf:"bytes,1,opt,name=CamId,proto3" json:"CamId,omitempty"` @@ -50,7 +51,7 @@ return xxx_messageInfo_TaskBasicInfo.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 } @@ -156,7 +157,7 @@ return xxx_messageInfo_RuleParams.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 } @@ -232,7 +233,7 @@ return xxx_messageInfo_SoRule.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 } @@ -340,7 +341,7 @@ return xxx_messageInfo_SoTarget.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 } @@ -401,103 +402,103 @@ return 0 } -type SOResult struct { +type SoResult struct { IsEvent bool `protobuf:"varint,1,opt,name=IsEvent,proto3" json:"IsEvent,omitempty"` IsEndRecord bool `protobuf:"varint,2,opt,name=IsEndRecord,proto3" json:"IsEndRecord,omitempty"` Targets []*SoTarget `protobuf:"bytes,3,rep,name=Targets,proto3" json:"Targets,omitempty"` FirstImage *Image `protobuf:"bytes,4,opt,name=FirstImage,proto3" json:"FirstImage,omitempty"` CacheImage *Image `protobuf:"bytes,5,opt,name=CacheImage,proto3" json:"CacheImage,omitempty"` - SoRule *SoRule `protobuf:"bytes,6,opt,name=SoRule,proto3" json:"SoRule,omitempty"` - GroupRule *GroupRule `protobuf:"bytes,7,opt,name=GroupRule,proto3" json:"GroupRule,omitempty"` + SoRule *SoRule `protobuf:"bytes,6,opt,name=soRule,proto3" json:"soRule,omitempty"` + GroupRule *GroupRule `protobuf:"bytes,7,opt,name=groupRule,proto3" json:"groupRule,omitempty"` SoType string `protobuf:"bytes,8,opt,name=SoType,proto3" json:"SoType,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SOResult) Reset() { *m = SOResult{} } -func (m *SOResult) String() string { return proto.CompactTextString(m) } -func (*SOResult) ProtoMessage() {} -func (*SOResult) Descriptor() ([]byte, []int) { +func (m *SoResult) Reset() { *m = SoResult{} } +func (m *SoResult) String() string { return proto.CompactTextString(m) } +func (*SoResult) ProtoMessage() {} +func (*SoResult) Descriptor() ([]byte, []int) { return fileDescriptor_02f614a9207041cc, []int{4} } -func (m *SOResult) XXX_Unmarshal(b []byte) error { +func (m *SoResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SOResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SoResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SOResult.Marshal(b, m, deterministic) + return xxx_messageInfo_SoResult.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 } return b[:n], nil } } -func (m *SOResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_SOResult.Merge(m, src) +func (m *SoResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoResult.Merge(m, src) } -func (m *SOResult) XXX_Size() int { +func (m *SoResult) XXX_Size() int { return m.Size() } -func (m *SOResult) XXX_DiscardUnknown() { - xxx_messageInfo_SOResult.DiscardUnknown(m) +func (m *SoResult) XXX_DiscardUnknown() { + xxx_messageInfo_SoResult.DiscardUnknown(m) } -var xxx_messageInfo_SOResult proto.InternalMessageInfo +var xxx_messageInfo_SoResult proto.InternalMessageInfo -func (m *SOResult) GetIsEvent() bool { +func (m *SoResult) GetIsEvent() bool { if m != nil { return m.IsEvent } return false } -func (m *SOResult) GetIsEndRecord() bool { +func (m *SoResult) GetIsEndRecord() bool { if m != nil { return m.IsEndRecord } return false } -func (m *SOResult) GetTargets() []*SoTarget { +func (m *SoResult) GetTargets() []*SoTarget { if m != nil { return m.Targets } return nil } -func (m *SOResult) GetFirstImage() *Image { +func (m *SoResult) GetFirstImage() *Image { if m != nil { return m.FirstImage } return nil } -func (m *SOResult) GetCacheImage() *Image { +func (m *SoResult) GetCacheImage() *Image { if m != nil { return m.CacheImage } return nil } -func (m *SOResult) GetSoRule() *SoRule { +func (m *SoResult) GetSoRule() *SoRule { if m != nil { return m.SoRule } return nil } -func (m *SOResult) GetGroupRule() *GroupRule { +func (m *SoResult) GetGroupRule() *GroupRule { if m != nil { return m.GroupRule } return nil } -func (m *SOResult) GetSoType() string { +func (m *SoResult) GetSoType() string { if m != nil { return m.SoType } @@ -527,7 +528,7 @@ return xxx_messageInfo_EventCache.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 } @@ -590,7 +591,7 @@ return xxx_messageInfo_TargetCache.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 } @@ -653,7 +654,7 @@ return xxx_messageInfo_FilterResult.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 } @@ -698,7 +699,7 @@ proto.RegisterType((*RuleParams)(nil), "protomsg.RuleParams") proto.RegisterType((*SoRule)(nil), "protomsg.SoRule") proto.RegisterType((*SoTarget)(nil), "protomsg.SoTarget") - proto.RegisterType((*SOResult)(nil), "protomsg.SOResult") + proto.RegisterType((*SoResult)(nil), "protomsg.SoResult") proto.RegisterType((*EventCache)(nil), "protomsg.EventCache") proto.RegisterMapType((map[int64]*Image)(nil), "protomsg.EventCache.ImagesEntry") proto.RegisterMapType((map[string]*GroupRule)(nil), "protomsg.EventCache.RuleGroupsEntry") @@ -713,71 +714,71 @@ func init() { proto.RegisterFile("dataprocess.proto", fileDescriptor_02f614a9207041cc) } var fileDescriptor_02f614a9207041cc = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xc6, 0x4e, 0x93, 0xda, 0x2f, 0x65, 0x5b, 0x86, 0x02, 0x56, 0x04, 0x55, 0x30, 0x54, 0x0a, - 0xcb, 0xaa, 0x88, 0xee, 0x65, 0xb5, 0x68, 0x0f, 0x6d, 0xda, 0x82, 0x39, 0x6c, 0xcb, 0xb8, 0x82, - 0xf3, 0x6c, 0x3c, 0xa4, 0x51, 0xec, 0x38, 0x9a, 0x71, 0x8a, 0xf2, 0x03, 0xb8, 0x70, 0xe2, 0xc8, - 0x5f, 0xe1, 0x1f, 0x20, 0x71, 0xe1, 0x27, 0xa0, 0xf2, 0x0b, 0x38, 0x73, 0x41, 0xf3, 0x66, 0x9c, - 0x99, 0x64, 0x1d, 0x71, 0xe2, 0x94, 0x79, 0xcf, 0xdf, 0xfb, 0xe6, 0xcd, 0xf7, 0xbe, 0x99, 0xc0, - 0x5b, 0x19, 0xab, 0xd8, 0x5c, 0x94, 0x23, 0x2e, 0xe5, 0xc9, 0x5c, 0x94, 0x55, 0x49, 0x02, 0xfc, - 0x29, 0xe4, 0xb8, 0x17, 0xca, 0x6c, 0xaa, 0x93, 0x3d, 0x10, 0x8b, 0x9c, 0x9b, 0xf5, 0xa3, 0x1a, - 0xa0, 0xe3, 0xf8, 0x47, 0x1f, 0xde, 0xbc, 0x65, 0x72, 0x7a, 0xce, 0xe4, 0x64, 0x94, 0xcc, 0xbe, - 0x2f, 0xc9, 0x21, 0xb4, 0x87, 0xac, 0x48, 0xb2, 0xc8, 0xeb, 0x7b, 0x83, 0x90, 0xea, 0x80, 0x44, - 0xb0, 0x3b, 0x64, 0xc5, 0x4b, 0x56, 0xf0, 0xc8, 0xc7, 0x7c, 0x1d, 0x92, 0x77, 0xa1, 0xa3, 0x08, - 0x92, 0x8b, 0xa8, 0x85, 0x1f, 0x4c, 0x44, 0x7a, 0x10, 0xa8, 0x15, 0x96, 0xec, 0xe0, 0x97, 0x55, - 0x4c, 0x8e, 0x00, 0xbe, 0x62, 0xb3, 0x2c, 0xe7, 0xb7, 0x93, 0x82, 0x47, 0x6d, 0xfc, 0xea, 0x64, - 0xd4, 0x6e, 0x49, 0xc1, 0xc6, 0x3c, 0xc9, 0xa2, 0x4e, 0xdf, 0x1b, 0xb4, 0x68, 0x1d, 0x92, 0xf7, - 0x21, 0xc4, 0x25, 0x16, 0xee, 0x62, 0xa1, 0x4d, 0x90, 0x3e, 0x74, 0x13, 0x79, 0x39, 0xcb, 0x28, - 0x1f, 0x95, 0x22, 0x8b, 0x82, 0xbe, 0x37, 0x08, 0xa8, 0x9b, 0x52, 0xdd, 0x5e, 0x4d, 0x72, 0x45, - 0x1c, 0xea, 0x6e, 0x75, 0x14, 0xff, 0xec, 0x01, 0xd0, 0x45, 0xce, 0x6f, 0x98, 0x60, 0x85, 0x54, - 0x44, 0x69, 0x36, 0x3d, 0x13, 0xe3, 0xb3, 0x7c, 0xc2, 0xa4, 0x91, 0xc2, 0x4d, 0xa9, 0xe3, 0x5d, - 0xcf, 0xb9, 0x60, 0x55, 0x29, 0x8c, 0x22, 0xab, 0x98, 0xc4, 0xb0, 0x57, 0xaf, 0x6f, 0x97, 0x73, - 0x6e, 0x84, 0x59, 0xcb, 0xd9, 0x1d, 0xbe, 0x65, 0xf9, 0xa2, 0x56, 0xc8, 0x4d, 0xc5, 0x3f, 0xf9, - 0xd0, 0x49, 0x4b, 0xd5, 0x14, 0x79, 0x04, 0xfe, 0x6a, 0x20, 0x7e, 0x92, 0xa9, 0xcd, 0x87, 0xac, - 0xe0, 0x82, 0x25, 0x59, 0xbd, 0x79, 0x1d, 0x2b, 0x85, 0x6e, 0xca, 0x7c, 0x39, 0x2e, 0x67, 0x49, - 0x66, 0x76, 0xb6, 0x09, 0x35, 0xdd, 0x34, 0x9b, 0x26, 0x99, 0xd9, 0x50, 0x07, 0x84, 0xc0, 0x4e, - 0x5a, 0x8a, 0x0a, 0x27, 0xd1, 0xa6, 0xb8, 0x56, 0x0d, 0xaa, 0xbd, 0xbf, 0x9b, 0x54, 0x77, 0x37, - 0x82, 0xe3, 0x1c, 0x42, 0xea, 0xa6, 0xd4, 0x31, 0x13, 0x99, 0xb2, 0x7b, 0x7e, 0x36, 0x5b, 0xde, - 0x95, 0x3f, 0xe0, 0x38, 0x02, 0xba, 0x96, 0x53, 0x93, 0xfc, 0x52, 0x94, 0x8b, 0x79, 0xa2, 0xa7, - 0x11, 0xd2, 0x3a, 0x24, 0x4f, 0xa0, 0xa3, 0xc5, 0x8e, 0xc2, 0x7e, 0x6b, 0xd0, 0x3d, 0x3d, 0x3c, - 0x59, 0x59, 0xd3, 0x0e, 0x82, 0x1a, 0x4c, 0xfc, 0xb7, 0x07, 0x41, 0x5a, 0xde, 0x32, 0x31, 0xe6, - 0x15, 0x39, 0x81, 0x30, 0x15, 0x23, 0x1d, 0xa0, 0x2a, 0xdd, 0xd3, 0x03, 0x5b, 0xad, 0xf3, 0xd4, - 0x42, 0xd4, 0xd0, 0xcf, 0x04, 0xb7, 0x62, 0x99, 0x48, 0xc9, 0xa8, 0x56, 0x68, 0x51, 0xad, 0xd4, - 0x2a, 0x26, 0x03, 0xd8, 0x3f, 0xe7, 0x79, 0x39, 0x1b, 0x4b, 0x4d, 0x92, 0x5c, 0x18, 0xc9, 0x36, - 0xd3, 0xe4, 0x05, 0xc0, 0xb0, 0x2c, 0xe6, 0x17, 0xaf, 0xd4, 0xf5, 0x89, 0xda, 0x78, 0x98, 0x0f, - 0xd6, 0x0f, 0x73, 0xce, 0x24, 0x57, 0x18, 0x26, 0xb8, 0x02, 0x51, 0xa7, 0x60, 0xbb, 0xd7, 0xe3, - 0xdf, 0x7d, 0x08, 0xd2, 0x6b, 0xca, 0xe5, 0x22, 0xaf, 0x10, 0x26, 0x2f, 0xef, 0xf9, 0x4c, 0x9f, - 0x38, 0xa0, 0x75, 0xb8, 0x69, 0x7a, 0xff, 0x75, 0xd3, 0x3f, 0x81, 0x5d, 0xdd, 0xad, 0x8c, 0x5a, - 0xd8, 0x1e, 0xb1, 0xed, 0xd5, 0xa2, 0xd2, 0x1a, 0x42, 0x3e, 0x03, 0xb8, 0x9a, 0x08, 0x59, 0x61, - 0x1b, 0x78, 0xe8, 0xee, 0xe9, 0xbe, 0x2d, 0xc0, 0x34, 0x75, 0x20, 0xaa, 0x60, 0xc8, 0x46, 0x77, - 0x5c, 0x17, 0xb4, 0xb7, 0x14, 0x58, 0x08, 0x19, 0xd4, 0xc6, 0xc6, 0x13, 0xaf, 0x0d, 0x4f, 0xe7, - 0x69, 0x6d, 0xfc, 0xcf, 0x21, 0x44, 0xbf, 0x20, 0x78, 0x17, 0xc1, 0x6f, 0x5b, 0xf0, 0xea, 0x13, - 0xb5, 0x28, 0x35, 0xec, 0xb4, 0xc4, 0x6b, 0xa7, 0x0d, 0x67, 0xa2, 0xf8, 0xd7, 0x16, 0x00, 0x0a, - 0x86, 0x8d, 0x90, 0x2f, 0xac, 0x26, 0x1e, 0x6a, 0xf2, 0xa1, 0xe5, 0xb5, 0x30, 0x63, 0x26, 0x79, - 0x39, 0xab, 0xc4, 0xd2, 0x4a, 0x74, 0xa1, 0x1f, 0x0b, 0xdc, 0x54, 0x46, 0x3e, 0xd6, 0x7f, 0xdc, - 0x58, 0x6f, 0x61, 0x9a, 0xc2, 0xa9, 0x23, 0xcf, 0xa0, 0x83, 0x7a, 0xd4, 0x53, 0xe9, 0x37, 0x32, - 0x68, 0x88, 0xae, 0x36, 0xf8, 0xde, 0x4b, 0xd8, 0x73, 0x1b, 0x23, 0x07, 0xd0, 0x9a, 0xf2, 0x25, - 0x1a, 0x63, 0x87, 0xaa, 0x25, 0x19, 0x40, 0xfb, 0x1e, 0x1f, 0x16, 0x1f, 0x45, 0x6b, 0x1a, 0xb8, - 0x06, 0x3c, 0xf7, 0x9f, 0x79, 0x3d, 0x0a, 0xfb, 0x1b, 0x8d, 0xba, 0x94, 0xa1, 0xa6, 0xfc, 0x64, - 0x9d, 0xb2, 0x71, 0x0e, 0x0e, 0xe7, 0xd7, 0xd0, 0x75, 0x5a, 0x77, 0xf9, 0x5a, 0x9a, 0xef, 0x78, - 0x9d, 0xef, 0x35, 0xc7, 0x58, 0xae, 0xf8, 0x1f, 0x0f, 0xba, 0xba, 0x6b, 0x3d, 0xbc, 0xc7, 0xea, - 0x3f, 0xc7, 0xdc, 0xfe, 0x6d, 0x7e, 0x36, 0x08, 0x72, 0xd9, 0x30, 0xab, 0xe3, 0xcd, 0xd7, 0xe2, - 0xbf, 0x87, 0x75, 0x0c, 0x6d, 0xed, 0xef, 0xd6, 0x96, 0x6e, 0xf1, 0xe7, 0xff, 0x50, 0x32, 0x7e, - 0xf0, 0x61, 0xef, 0x6a, 0x92, 0x57, 0x5c, 0x98, 0xb7, 0xe0, 0x29, 0x04, 0xea, 0x45, 0xc1, 0xf7, - 0x46, 0x3f, 0x7f, 0xef, 0xb9, 0x07, 0x72, 0xfe, 0xcd, 0xe9, 0x0a, 0x48, 0x9e, 0x43, 0x07, 0x5d, - 0x55, 0x6b, 0x10, 0xdb, 0x12, 0x97, 0x5c, 0x5b, 0xaf, 0xf6, 0x9b, 0x0e, 0xc8, 0x8b, 0xcd, 0x07, - 0xe4, 0xa3, 0x2d, 0xc5, 0x8d, 0xd7, 0xa5, 0x77, 0x0d, 0x5d, 0x87, 0xb5, 0x41, 0x90, 0xc7, 0xeb, - 0x82, 0x1c, 0x36, 0x5d, 0x04, 0xd7, 0x5b, 0xdf, 0x6c, 0xf7, 0xbf, 0x61, 0xfc, 0x74, 0x9d, 0xf1, - 0x9d, 0xc6, 0x81, 0x3b, 0x94, 0xe7, 0x07, 0xbf, 0x3d, 0x1c, 0x79, 0x7f, 0x3c, 0x1c, 0x79, 0x7f, - 0x3e, 0x1c, 0x79, 0xbf, 0xfc, 0x75, 0xf4, 0xc6, 0xab, 0x0e, 0x96, 0x3c, 0xfd, 0x37, 0x00, 0x00, - 0xff, 0xff, 0x6a, 0x76, 0xad, 0xeb, 0x67, 0x09, 0x00, 0x00, + // 926 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x41, 0x6f, 0x23, 0x35, + 0x14, 0x66, 0x26, 0x4d, 0x9a, 0x79, 0x29, 0xdb, 0x62, 0x0a, 0x8c, 0x22, 0x88, 0xc2, 0x40, 0xa5, + 0xb0, 0xac, 0x8a, 0xe8, 0x5e, 0x56, 0x8b, 0xf6, 0xd0, 0xa6, 0xed, 0x32, 0x1c, 0x76, 0x8b, 0x53, + 0xc1, 0xd9, 0x9b, 0x31, 0x69, 0x94, 0x99, 0x4c, 0x64, 0x4f, 0x8a, 0xf2, 0x03, 0xb8, 0x70, 0xe2, + 0xc8, 0x5f, 0xe1, 0x1f, 0x20, 0x71, 0xe1, 0x27, 0xa0, 0xf0, 0x0b, 0x38, 0x73, 0x41, 0x7e, 0xf6, + 0xc4, 0x9e, 0xec, 0x44, 0x9c, 0xf6, 0x14, 0xbf, 0x37, 0xdf, 0xfb, 0xfc, 0xfc, 0xbd, 0xcf, 0x0e, + 0xbc, 0x93, 0xb0, 0x82, 0x2d, 0x44, 0x3e, 0xe6, 0x52, 0x9e, 0x2e, 0x44, 0x5e, 0xe4, 0xa4, 0x8d, + 0x3f, 0x99, 0x9c, 0x74, 0x03, 0x99, 0xcc, 0x74, 0xb2, 0x0b, 0x62, 0x99, 0x72, 0xb3, 0x7e, 0x50, + 0x02, 0x74, 0x1c, 0xfd, 0xe4, 0xc3, 0xdb, 0xb7, 0x4c, 0xce, 0x2e, 0x98, 0x9c, 0x8e, 0xe3, 0xf9, + 0x0f, 0x39, 0x39, 0x86, 0xe6, 0x90, 0x65, 0x71, 0x12, 0x7a, 0x7d, 0x6f, 0x10, 0x50, 0x1d, 0x90, + 0x10, 0xf6, 0x87, 0x2c, 0x7b, 0xc1, 0x32, 0x1e, 0xfa, 0x98, 0x2f, 0x43, 0xf2, 0x3e, 0xb4, 0x14, + 0x41, 0x7c, 0x19, 0x36, 0xf0, 0x83, 0x89, 0x48, 0x17, 0xda, 0x6a, 0x85, 0x25, 0x7b, 0xf8, 0x65, + 0x13, 0x93, 0x1e, 0xc0, 0xd7, 0x6c, 0x9e, 0xa4, 0xfc, 0x76, 0x9a, 0xf1, 0xb0, 0x89, 0x5f, 0x9d, + 0x8c, 0xda, 0x2d, 0xce, 0xd8, 0x84, 0xc7, 0x49, 0xd8, 0xea, 0x7b, 0x83, 0x06, 0x2d, 0x43, 0xf2, + 0x21, 0x04, 0xb8, 0xc4, 0xc2, 0x7d, 0x2c, 0xb4, 0x09, 0xd2, 0x87, 0x4e, 0x2c, 0xaf, 0xe6, 0x09, + 0xe5, 0xe3, 0x5c, 0x24, 0x61, 0xbb, 0xef, 0x0d, 0xda, 0xd4, 0x4d, 0xa9, 0x6e, 0xaf, 0xa7, 0xa9, + 0x22, 0x0e, 0x74, 0xb7, 0x3a, 0x8a, 0x7e, 0xf1, 0x00, 0xe8, 0x32, 0xe5, 0x37, 0x4c, 0xb0, 0x4c, + 0x2a, 0xa2, 0x51, 0x32, 0x3b, 0x17, 0x93, 0xf3, 0x74, 0xca, 0xa4, 0x91, 0xc2, 0x4d, 0xa9, 0xe3, + 0xbd, 0x5c, 0x70, 0xc1, 0x8a, 0x5c, 0x18, 0x45, 0x36, 0x31, 0x89, 0xe0, 0xa0, 0x5c, 0xdf, 0xae, + 0x16, 0xdc, 0x08, 0x53, 0xc9, 0xd9, 0x1d, 0xbe, 0x63, 0xe9, 0xb2, 0x54, 0xc8, 0x4d, 0x45, 0x3f, + 0xfb, 0xd0, 0x1a, 0xe5, 0xaa, 0x29, 0xf2, 0x00, 0xfc, 0xcd, 0x40, 0xfc, 0x38, 0x51, 0x9b, 0x0f, + 0x59, 0xc6, 0x05, 0x8b, 0x93, 0x72, 0xf3, 0x32, 0x56, 0x0a, 0xdd, 0xe4, 0xe9, 0x6a, 0x92, 0xcf, + 0xe3, 0xc4, 0xec, 0x6c, 0x13, 0x6a, 0xba, 0xa3, 0x64, 0x16, 0x27, 0x66, 0x43, 0x1d, 0x10, 0x02, + 0x7b, 0xa3, 0x5c, 0x14, 0x38, 0x89, 0x26, 0xc5, 0xb5, 0x6a, 0x50, 0xed, 0xfd, 0xfd, 0xb4, 0xb8, + 0xbb, 0x11, 0x1c, 0xe7, 0x10, 0x50, 0x37, 0xa5, 0x8e, 0x19, 0xcb, 0x11, 0xbb, 0xe7, 0xe7, 0xf3, + 0xd5, 0x5d, 0xfe, 0x23, 0x8e, 0xa3, 0x4d, 0x2b, 0x39, 0x35, 0xc9, 0xe7, 0x22, 0x5f, 0x2e, 0x62, + 0x3d, 0x8d, 0x80, 0x96, 0x21, 0x79, 0x04, 0x2d, 0x2d, 0x76, 0x18, 0xf4, 0x1b, 0x83, 0xce, 0xd9, + 0xf1, 0xe9, 0xc6, 0x9a, 0x76, 0x10, 0xd4, 0x60, 0xa2, 0x7f, 0x3c, 0x68, 0x8f, 0xf2, 0x5b, 0x26, + 0x26, 0xbc, 0x20, 0xa7, 0x10, 0x8c, 0xc4, 0x58, 0x07, 0xa8, 0x4a, 0xe7, 0xec, 0xc8, 0x56, 0xeb, + 0x3c, 0xb5, 0x10, 0x35, 0xf4, 0x73, 0xc1, 0xad, 0x58, 0x26, 0x52, 0x32, 0xaa, 0x15, 0x5a, 0x54, + 0x2b, 0xb5, 0x89, 0xc9, 0x00, 0x0e, 0x2f, 0x78, 0x9a, 0xcf, 0x27, 0x52, 0x93, 0xc4, 0x97, 0x46, + 0xb2, 0xed, 0x34, 0x79, 0x06, 0x30, 0xcc, 0xb3, 0xc5, 0xe5, 0x2b, 0x75, 0x7d, 0xc2, 0x26, 0x1e, + 0xe6, 0xa3, 0xea, 0x61, 0x2e, 0x98, 0xe4, 0x0a, 0xc3, 0x04, 0x57, 0x20, 0xea, 0x14, 0xec, 0xf6, + 0x7a, 0xf4, 0x87, 0xaf, 0xce, 0x4c, 0xb9, 0x5c, 0xa6, 0x05, 0xc2, 0xe4, 0xd5, 0x3d, 0x9f, 0xeb, + 0x13, 0xb7, 0x69, 0x19, 0x6e, 0x9b, 0xde, 0x7f, 0xdd, 0xf4, 0x8f, 0x60, 0x5f, 0x77, 0x2b, 0xc3, + 0x06, 0xb6, 0x47, 0x6c, 0x7b, 0xa5, 0xa8, 0xb4, 0x84, 0x90, 0x2f, 0x00, 0xae, 0xa7, 0x42, 0x16, + 0xd8, 0x06, 0x1e, 0xba, 0x73, 0x76, 0x68, 0x0b, 0x30, 0x4d, 0x1d, 0x88, 0x2a, 0x18, 0xb2, 0xf1, + 0x1d, 0xd7, 0x05, 0xcd, 0x1d, 0x05, 0x16, 0x42, 0x06, 0xd0, 0x92, 0x68, 0x6c, 0x3c, 0x71, 0x65, + 0x78, 0xda, 0xf0, 0xd4, 0x7c, 0x27, 0x5f, 0x42, 0x30, 0x51, 0x7e, 0x41, 0xf0, 0x3e, 0x82, 0xdf, + 0xb5, 0xe0, 0xe7, 0xe5, 0x27, 0x6a, 0x51, 0x6a, 0xd8, 0xa3, 0x1c, 0xaf, 0x9d, 0x36, 0x9c, 0x89, + 0xa2, 0xdf, 0x1a, 0x00, 0x28, 0x18, 0x36, 0x42, 0xbe, 0xb2, 0x9a, 0x78, 0xa8, 0xc9, 0xc7, 0x96, + 0xd7, 0xc2, 0x8c, 0x99, 0xe4, 0xd5, 0xbc, 0x10, 0x2b, 0x2b, 0xd1, 0xa5, 0x7e, 0x2c, 0x70, 0x7f, + 0x19, 0xfa, 0x58, 0xff, 0x69, 0x6d, 0xbd, 0x85, 0x69, 0x0a, 0xa7, 0x8e, 0x3c, 0x81, 0x16, 0xea, + 0x51, 0x4e, 0xa5, 0x5f, 0xcb, 0xa0, 0x21, 0xba, 0xda, 0xe0, 0xbb, 0x2f, 0xe0, 0xc0, 0x6d, 0x8c, + 0x1c, 0x41, 0x63, 0xc6, 0x57, 0x68, 0x8c, 0x3d, 0xaa, 0x96, 0x64, 0x00, 0xcd, 0x7b, 0x7c, 0x58, + 0x7c, 0x14, 0xad, 0x6e, 0xe0, 0x1a, 0xf0, 0xd4, 0x7f, 0xe2, 0x75, 0x29, 0x1c, 0x6e, 0x35, 0xea, + 0x52, 0x06, 0x9a, 0xf2, 0xb3, 0x2a, 0x65, 0xed, 0x1c, 0x1c, 0xce, 0x6f, 0xa0, 0xe3, 0xb4, 0xee, + 0xf2, 0x35, 0x34, 0xdf, 0x49, 0x95, 0xef, 0x35, 0xc7, 0x58, 0xae, 0xe8, 0x5f, 0x0f, 0x3a, 0xba, + 0x6b, 0x3d, 0xbc, 0x87, 0xea, 0x3f, 0xc7, 0xdc, 0xfe, 0x5d, 0x7e, 0x36, 0x08, 0x72, 0x55, 0x33, + 0xab, 0x93, 0xed, 0xd7, 0xe2, 0xff, 0x87, 0x75, 0x02, 0x4d, 0xed, 0xef, 0xc6, 0x8e, 0x6e, 0xf1, + 0xe7, 0x4d, 0x28, 0x19, 0xad, 0x7d, 0x38, 0xb8, 0x9e, 0xa6, 0x05, 0x17, 0xe6, 0x2d, 0x78, 0x0c, + 0x6d, 0xf5, 0xa2, 0xe0, 0x7b, 0xa3, 0x9f, 0xbf, 0x0f, 0xdc, 0x03, 0x39, 0xff, 0xe6, 0x74, 0x03, + 0x24, 0x4f, 0xa1, 0x85, 0xae, 0x2a, 0x35, 0x88, 0x6c, 0x89, 0x4b, 0xae, 0xad, 0x57, 0xfa, 0x4d, + 0x07, 0xe4, 0xd9, 0xf6, 0x03, 0xf2, 0xc9, 0x8e, 0xe2, 0xda, 0xeb, 0xd2, 0x7d, 0x09, 0x1d, 0x87, + 0xb5, 0x46, 0x90, 0x87, 0x55, 0x41, 0x8e, 0xeb, 0x2e, 0x82, 0xeb, 0xad, 0x6f, 0x77, 0xfb, 0xdf, + 0x30, 0x7e, 0x5e, 0x65, 0x7c, 0xaf, 0x76, 0xe0, 0x0e, 0xe5, 0xc5, 0xd1, 0xef, 0xeb, 0x9e, 0xf7, + 0xe7, 0xba, 0xe7, 0xfd, 0xb5, 0xee, 0x79, 0xbf, 0xfe, 0xdd, 0x7b, 0xeb, 0x55, 0x0b, 0x4b, 0x1e, + 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x62, 0x1f, 0x43, 0x67, 0x09, 0x00, 0x00, } func (m *TaskBasicInfo) 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 } @@ -785,77 +786,90 @@ } func (m *TaskBasicInfo) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TaskBasicInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.CamId) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.CamId))) - i += copy(dAtA[i:], m.CamId) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - 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 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 m.IsEndRecord { - dAtA[i] = 0x40 - i++ + i-- if m.IsEndRecord { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x40 } - if len(m.FileId) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.FileId))) - i += copy(dAtA[i:], m.FileId) + 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 m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.ImageId != 0 { + i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) + i-- + dAtA[i] = 0x30 } - return i, nil + 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 } func (m *RuleParams) 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 } @@ -863,44 +877,54 @@ } func (m *RuleParams) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RuleParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - 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 { - dAtA[i] = 0x12 - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Operator))) - i += copy(dAtA[i:], m.Operator) - } - if len(m.OperatorType) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.OperatorType))) - i += copy(dAtA[i:], m.OperatorType) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.SdkArgValue) > 0 { - dAtA[i] = 0x22 - i++ + i -= len(m.SdkArgValue) + copy(dAtA[i:], m.SdkArgValue) i = encodeVarintDataprocess(dAtA, i, uint64(len(m.SdkArgValue))) - i += copy(dAtA[i:], m.SdkArgValue) + i-- + dAtA[i] = 0x22 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + 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 } - return i, nil + 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 + } + 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 + } + return len(dAtA) - i, nil } func (m *SoRule) 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 } @@ -908,83 +932,97 @@ } func (m *SoRule) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SoRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Id) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.Id))) - i += copy(dAtA[i:], m.Id) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - 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.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.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 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 m.IsSaveAnyhow { - dAtA[i] = 0x38 - i++ + i-- if m.IsSaveAnyhow { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x38 } - if len(m.GroupId) > 0 { - dAtA[i] = 0x42 - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.GroupId))) - i += copy(dAtA[i:], m.GroupId) + 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.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 m.Sort != 0 { + i = encodeVarintDataprocess(dAtA, i, uint64(m.Sort)) + i-- + dAtA[i] = 0x28 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + 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 } - return i, nil + 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 } func (m *SoTarget) 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 } @@ -992,164 +1030,194 @@ } func (m *SoTarget) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SoTarget) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - 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 - } - i += n1 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.AreaId) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(len(m.AreaId))) - i += copy(dAtA[i:], m.AreaId) - } - 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 m.ImageId != 0 { + i = encodeVarintDataprocess(dAtA, i, uint64(m.ImageId)) + i-- + dAtA[i] = 0x30 } if len(m.CompDbInfo) > 0 { - for _, msg := range m.CompDbInfo { + 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 - i++ - i = encodeVarintDataprocess(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + } + } + 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 + } + 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 + } + if m.SrcTarget != nil { + { + size, err := m.SrcTarget.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - 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 + return len(dAtA) - i, nil } -func (m *SOResult) Marshal() (dAtA []byte, err error) { +func (m *SoResult) 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 } return dAtA[:n], nil } -func (m *SOResult) MarshalTo(dAtA []byte) (int, error) { - var i int +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) _ = i var l int _ = l - if m.IsEvent { - dAtA[i] = 0x8 - i++ - if m.IsEvent { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + 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++ + 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 { - dAtA[i] = 0x10 - i++ + i-- if m.IsEndRecord { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x10 } - 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.IsEvent { + i-- + if m.IsEvent { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } + i-- + dAtA[i] = 0x8 } - 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 + return len(dAtA) - i, nil } func (m *EventCache) 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 } @@ -1157,102 +1225,100 @@ } func (m *EventCache) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventCache) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Targets) > 0 { - for k, _ := range m.Targets { - dAtA[i] = 0xa - i++ - v := m.Targets[k] - msgSize := 0 + 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 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())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) } - i += n6 + i-- + dAtA[i] = 0x12 } + i = encodeVarintDataprocess(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } if len(m.RuleGroups) > 0 { - for k, _ := range m.RuleGroups { - dAtA[i] = 0x12 - i++ + for k := range m.RuleGroups { v := m.RuleGroups[k] - msgSize := 0 + baseI := i if v != nil { - msgSize = v.Size() - msgSize += 1 + sovDataprocess(uint64(msgSize)) + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - mapSize := 1 + len(k) + sovDataprocess(uint64(len(k))) + msgSize - i = encodeVarintDataprocess(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) 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 - } + i-- + dAtA[i] = 0xa + i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if len(m.Images) > 0 { - for k, _ := range m.Images { - dAtA[i] = 0x1a - i++ - v := m.Images[k] - msgSize := 0 + if len(m.Targets) > 0 { + for k := range m.Targets { + v := m.Targets[k] + baseI := i if v != nil { - msgSize = v.Size() - msgSize += 1 + sovDataprocess(uint64(msgSize)) + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - 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 - } + i-- + dAtA[i] = 0x8 + i = encodeVarintDataprocess(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *TargetCache) 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 } @@ -1260,70 +1326,78 @@ } func (m *TargetCache) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TargetCache) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - 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 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 err != nil { return 0, err } - i += n + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x1a } if len(m.RuleGroups) > 0 { - for k, _ := range m.RuleGroups { - dAtA[i] = 0x12 - i++ + for k := range m.RuleGroups { v := m.RuleGroups[k] - msgSize := 0 + baseI := i 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())) - n9, err9 := v.MarshalTo(dAtA[i:]) - if err9 != nil { - return 0, err9 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) } - i += n9 + 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] = 0x12 } } - 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 + 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-- + dAtA[i] = 0xa } - i += n10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *FilterResult) 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 } @@ -1331,90 +1405,96 @@ } func (m *FilterResult) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FilterResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - 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 { - dAtA[i] = 0x12 - i++ - v := m.Events[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())) - n12, err12 := v.MarshalTo(dAtA[i:]) - if err12 != nil { - return 0, err12 - } - i += n12 - } - } + 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 { - dAtA[i] = 0x1a - i++ + for k := range m.Targets { v := m.Targets[k] - msgSize := 0 + baseI := i 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 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) } - i += n13 + 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.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + 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-- + dAtA[i] = 0x12 + } } - return i, nil + if m.BaseInfo != nil { + { + size, err := m.BaseInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataprocess(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - 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 offset + 1 + return base } func (m *TaskBasicInfo) Size() (n int) { if m == nil { @@ -1575,7 +1655,7 @@ return n } -func (m *SOResult) Size() (n int) { +func (m *SoResult) Size() (n int) { if m == nil { return 0 } @@ -1748,14 +1828,7 @@ } func sovDataprocess(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n + return (math_bits.Len64(x|1) + 6) / 7 } func sozDataprocess(x uint64) (n int) { return sovDataprocess(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -2058,10 +2131,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2240,10 +2310,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2559,10 +2626,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2798,10 +2862,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -2817,7 +2878,7 @@ } return nil } -func (m *SOResult) Unmarshal(dAtA []byte) error { +func (m *SoResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2840,10 +2901,10 @@ fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SOResult: wiretype end group for non-group") + return fmt.Errorf("proto: SoResult: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SOResult: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SoResult: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3102,10 +3163,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3254,7 +3312,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3383,7 +3441,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3498,7 +3556,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3515,10 +3573,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3715,7 +3770,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -3768,10 +3823,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -3970,7 +4022,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -4099,7 +4151,7 @@ if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > postIndex { @@ -4116,10 +4168,7 @@ if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthDataprocess - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDataprocess } if (iNdEx + skippy) > l { @@ -4138,6 +4187,7 @@ 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 { @@ -4169,10 +4219,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -4193,55 +4241,30 @@ return 0, ErrInvalidLengthDataprocess } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthDataprocess - } - 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 + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupDataprocess + } + depth-- 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 + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthDataprocess = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDataprocess = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthDataprocess = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowDataprocess = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupDataprocess = fmt.Errorf("proto: unexpected end of group") ) diff --git a/dataprocess.proto b/dataprocess.proto index d0937ef..2608a8a 100644 --- a/dataprocess.proto +++ b/dataprocess.proto @@ -45,14 +45,14 @@ int64 ImageId = 6; } -message SOResult { +message SoResult { bool IsEvent = 1; bool IsEndRecord = 2; repeated SoTarget Targets = 3; Image FirstImage = 4; Image CacheImage = 5; - SoRule SoRule = 6; - GroupRule GroupRule = 7; + SoRule soRule = 6; + GroupRule groupRule = 7; string SoType = 8; } -- Gitblit v1.8.0