From 616f132962974df4dc53072e9c42b80f85b4e8d2 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期五, 05 七月 2019 14:25:40 +0800
Subject: [PATCH] add es return infos
---
es.pb.go | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index aa7f334..8d26799 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -199,9 +199,10 @@
}
type Esinfo struct {
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- Tableid string `protobuf:"bytes,2,opt,name=tableid,proto3" json:"tableid,omitempty"`
- FaceFeature string `protobuf:"bytes,3,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ Tableid string `protobuf:"bytes,2,opt,name=tableid,proto3" json:"tableid,omitempty"`
+ FaceFeature string `protobuf:"bytes,3,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
+ CompareScore float32 `protobuf:"fixed32,4,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
}
func (m *Esinfo) Reset() { *m = Esinfo{} }
@@ -258,6 +259,13 @@
return ""
}
+func (m *Esinfo) GetCompareScore() float32 {
+ if m != nil {
+ return m.CompareScore
+ }
+ return 0
+}
+
func init() {
proto.RegisterType((*Baseinfo)(nil), "protomsg.Baseinfo")
proto.RegisterType((*Binfos)(nil), "protomsg.Binfos")
@@ -267,29 +275,29 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 338 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xc1, 0x4a, 0xfb, 0x40,
- 0x10, 0xc6, 0x9b, 0xe4, 0xdf, 0x34, 0x9d, 0x96, 0x3f, 0xb2, 0x07, 0x19, 0x44, 0x42, 0xc8, 0x29,
- 0xa7, 0x1e, 0xea, 0x1b, 0x14, 0x14, 0x0a, 0x52, 0xa4, 0xea, 0x03, 0x6c, 0x93, 0xa9, 0x2e, 0x34,
- 0xd9, 0xb2, 0x9b, 0x8a, 0x8f, 0xe1, 0x63, 0x79, 0xec, 0xd1, 0xa3, 0xb4, 0x57, 0x1f, 0x42, 0x32,
- 0x49, 0x6c, 0xab, 0xa7, 0x9d, 0xef, 0x37, 0xcb, 0xcc, 0xf0, 0x7d, 0x10, 0x90, 0x1d, 0xad, 0x8d,
- 0x2e, 0xb5, 0x08, 0xf8, 0xc9, 0xed, 0x53, 0xfc, 0xe5, 0x42, 0x30, 0x91, 0x96, 0x54, 0xb1, 0xd4,
- 0x22, 0x82, 0xc1, 0x52, 0xa6, 0x74, 0x43, 0xb2, 0xdc, 0x18, 0x42, 0x27, 0x72, 0x92, 0xfe, 0xfc,
- 0x18, 0x89, 0x0b, 0x08, 0xd6, 0x64, 0xac, 0x2e, 0xa6, 0x19, 0xba, 0xdc, 0xfe, 0xd1, 0x02, 0xa1,
- 0x57, 0xca, 0xc5, 0x8a, 0xa6, 0x19, 0x7a, 0xdc, 0x6a, 0xa5, 0xb8, 0x84, 0x3e, 0x97, 0x33, 0x99,
- 0x13, 0xfe, 0xe3, 0xde, 0x01, 0x88, 0x18, 0x86, 0xa9, 0xce, 0xd7, 0xd2, 0xd0, 0x7d, 0xaa, 0x0d,
- 0x61, 0x37, 0x72, 0x12, 0x77, 0x7e, 0xc2, 0x44, 0x08, 0x50, 0xef, 0xe1, 0x11, 0x3e, 0x8f, 0x38,
- 0x22, 0xd5, 0x8c, 0x5a, 0xdd, 0xa9, 0xf4, 0xd1, 0xac, 0xb0, 0xc7, 0x3f, 0x4e, 0x18, 0xdf, 0xfe,
- 0xac, 0x0b, 0x9a, 0x6d, 0x72, 0x0c, 0x9a, 0xdb, 0x1b, 0x2d, 0xce, 0xc0, 0xb3, 0xf4, 0x8a, 0x7d,
- 0xc6, 0x55, 0x29, 0xce, 0xc1, 0x57, 0x59, 0x2a, 0x4d, 0x86, 0xc0, 0xb0, 0x51, 0xd5, 0xa6, 0x5c,
- 0x17, 0xaa, 0xd4, 0xe6, 0x96, 0x5e, 0x68, 0x85, 0x83, 0x7a, 0xd3, 0x31, 0xab, 0x9c, 0x48, 0x75,
- 0x51, 0x52, 0x51, 0xe2, 0xb0, 0x76, 0xa2, 0x91, 0xf1, 0x18, 0xfc, 0x49, 0x65, 0xb5, 0x15, 0x09,
- 0x74, 0xb9, 0x40, 0x27, 0xf2, 0x92, 0xc1, 0x58, 0x8c, 0xda, 0x48, 0x46, 0x6d, 0x1c, 0xf3, 0xfa,
- 0x43, 0xfc, 0x00, 0xfe, 0xb5, 0xe5, 0x7c, 0xfe, 0x83, 0xab, 0xb2, 0x26, 0x16, 0x57, 0x1d, 0x1c,
- 0x57, 0x6d, 0x18, 0xad, 0xfc, 0x9d, 0xa4, 0xf7, 0x27, 0xc9, 0x09, 0xbe, 0xef, 0x42, 0x67, 0xbb,
- 0x0b, 0x9d, 0xcf, 0x5d, 0xe8, 0xbc, 0xed, 0xc3, 0xce, 0x76, 0x1f, 0x76, 0x3e, 0xf6, 0x61, 0x67,
- 0xe1, 0xf3, 0x25, 0x57, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x05, 0xa7, 0x2d, 0x5e, 0x2f, 0x02,
- 0x00, 0x00,
+ // 342 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x6a, 0xc2, 0x40,
+ 0x10, 0xc6, 0x4d, 0xa2, 0x31, 0x8e, 0x52, 0xca, 0x1e, 0xca, 0x50, 0x4a, 0x08, 0x39, 0xe5, 0xe4,
+ 0xc1, 0xbe, 0x81, 0xd0, 0x82, 0x50, 0xa4, 0x58, 0xfa, 0x00, 0x31, 0x19, 0xdb, 0x05, 0x93, 0x95,
+ 0xdd, 0x58, 0x7c, 0x8c, 0x3e, 0x56, 0x8f, 0x1e, 0x7b, 0x2c, 0x7a, 0xed, 0x43, 0x94, 0x4c, 0x92,
+ 0xfa, 0xef, 0xb4, 0xf3, 0xfd, 0x66, 0x99, 0x19, 0xbe, 0x0f, 0x3c, 0x32, 0xc3, 0x95, 0x56, 0x85,
+ 0x12, 0x1e, 0x3f, 0x99, 0x79, 0x0b, 0x7f, 0x6d, 0xf0, 0xc6, 0xb1, 0x21, 0x99, 0x2f, 0x94, 0x08,
+ 0xa0, 0xbf, 0x88, 0x13, 0x7a, 0xa4, 0xb8, 0x58, 0x6b, 0x42, 0x2b, 0xb0, 0xa2, 0xde, 0xec, 0x18,
+ 0x89, 0x5b, 0xf0, 0x56, 0xa4, 0x8d, 0xca, 0x27, 0x29, 0xda, 0xdc, 0xfe, 0xd7, 0x02, 0xa1, 0x5b,
+ 0xc4, 0xf3, 0x25, 0x4d, 0x52, 0x74, 0xb8, 0xd5, 0x48, 0x71, 0x07, 0x3d, 0x2e, 0xa7, 0x71, 0x46,
+ 0xd8, 0xe6, 0xde, 0x01, 0x88, 0x10, 0x06, 0x89, 0xca, 0x56, 0xb1, 0xa6, 0x97, 0x44, 0x69, 0xc2,
+ 0x4e, 0x60, 0x45, 0xf6, 0xec, 0x84, 0x09, 0x1f, 0xa0, 0xda, 0xc3, 0x23, 0x5c, 0x1e, 0x71, 0x44,
+ 0xca, 0x19, 0x95, 0x7a, 0x96, 0xc9, 0xab, 0x5e, 0x62, 0x97, 0x7f, 0x9c, 0x30, 0xbe, 0xfd, 0x5d,
+ 0xe5, 0x34, 0x5d, 0x67, 0xe8, 0xd5, 0xb7, 0xd7, 0x5a, 0x5c, 0x83, 0x63, 0x68, 0x83, 0x3d, 0xc6,
+ 0x65, 0x29, 0x6e, 0xc0, 0x95, 0x69, 0x12, 0xeb, 0x14, 0x81, 0x61, 0xad, 0xca, 0x4d, 0x99, 0xca,
+ 0x65, 0xa1, 0xf4, 0x13, 0x7d, 0xd0, 0x12, 0xfb, 0xd5, 0xa6, 0x63, 0x56, 0x3a, 0x91, 0xa8, 0xbc,
+ 0xa0, 0xbc, 0xc0, 0x41, 0xe5, 0x44, 0x2d, 0xc3, 0x11, 0xb8, 0xe3, 0xd2, 0x6a, 0x23, 0x22, 0xe8,
+ 0x70, 0x81, 0x56, 0xe0, 0x44, 0xfd, 0x91, 0x18, 0x36, 0x91, 0x0c, 0x9b, 0x38, 0x66, 0xd5, 0x87,
+ 0x70, 0x03, 0xee, 0x83, 0xe1, 0x7c, 0xae, 0xc0, 0x96, 0x69, 0x1d, 0x8b, 0x2d, 0x0f, 0x8e, 0xcb,
+ 0x26, 0x8c, 0x46, 0x9e, 0x27, 0xe9, 0x5c, 0x26, 0x79, 0xee, 0x7a, 0xfb, 0xd2, 0xf5, 0x31, 0x7e,
+ 0xed, 0x7c, 0x6b, 0xbb, 0xf3, 0xad, 0x9f, 0x9d, 0x6f, 0x7d, 0xee, 0xfd, 0xd6, 0x76, 0xef, 0xb7,
+ 0xbe, 0xf7, 0x7e, 0x6b, 0xee, 0xf2, 0xb5, 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xd8,
+ 0xed, 0xc7, 0x53, 0x02, 0x00, 0x00,
}
func (m *Baseinfo) Marshal() (dAtA []byte, err error) {
@@ -445,6 +453,12 @@
i = encodeVarintEs(dAtA, i, uint64(len(m.FaceFeature)))
i += copy(dAtA[i:], m.FaceFeature)
}
+ if m.CompareScore != 0 {
+ dAtA[i] = 0x25
+ i++
+ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
+ i += 4
+ }
return i, nil
}
@@ -545,6 +559,9 @@
l = len(m.FaceFeature)
if l > 0 {
n += 1 + l + sovEs(uint64(l))
+ }
+ if m.CompareScore != 0 {
+ n += 5
}
return n
}
@@ -1190,6 +1207,17 @@
}
m.FaceFeature = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 4:
+ if wireType != 5 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType)
+ }
+ var v uint32
+ if (iNdEx + 4) > l {
+ return io.ErrUnexpectedEOF
+ }
+ v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
+ iNdEx += 4
+ m.CompareScore = float32(math.Float32frombits(v))
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
--
Gitblit v1.8.0