From dc8ca60fc53199251100883b4370de52a6534463 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 14:01:53 +0800
Subject: [PATCH] soinfo id change to string
---
es.pb.go | 111 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 41 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index 32bf8f8..f03cf49 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -9,6 +9,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.
@@ -27,6 +28,7 @@
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"`
+ Enable int32 `protobuf:"varint,5,opt,name=enable,proto3" json:"enable,omitempty"`
}
func (m *Esinfo) Reset() { *m = Esinfo{} }
@@ -86,6 +88,13 @@
func (m *Esinfo) GetCompareScore() float32 {
if m != nil {
return m.CompareScore
+ }
+ return 0
+}
+
+func (m *Esinfo) GetEnable() int32 {
+ if m != nil {
+ return m.Enable
}
return 0
}
@@ -427,39 +436,39 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 500 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x41, 0x8e, 0xd3, 0x30,
- 0x14, 0x86, 0x9b, 0x86, 0x69, 0x13, 0x77, 0x3a, 0x0c, 0x5e, 0x20, 0x0b, 0x8d, 0xa2, 0xaa, 0x62,
- 0xd1, 0x15, 0x1b, 0x6e, 0x30, 0x94, 0x91, 0x2a, 0xa1, 0x11, 0x6a, 0x87, 0x03, 0x38, 0xf1, 0x9b,
- 0xc1, 0x52, 0x12, 0x47, 0x76, 0x5a, 0xda, 0x5b, 0x70, 0x13, 0xae, 0xc1, 0x72, 0x96, 0x2c, 0x58,
- 0xa0, 0xf6, 0x22, 0xc8, 0xcf, 0x49, 0x93, 0x0c, 0xa2, 0xb0, 0x6a, 0xff, 0xff, 0xb7, 0xdf, 0x7b,
- 0x7d, 0x9f, 0x55, 0x12, 0x80, 0x79, 0x53, 0x68, 0x55, 0x2a, 0x1a, 0xe0, 0x47, 0x66, 0x1e, 0xa6,
- 0x5b, 0x32, 0x78, 0x6f, 0x64, 0x7e, 0xaf, 0xe8, 0x05, 0xe9, 0x4b, 0xc1, 0xbc, 0x89, 0x37, 0x0b,
- 0x97, 0x7d, 0x29, 0x28, 0x23, 0xc3, 0x92, 0xc7, 0x29, 0x48, 0xc1, 0xfa, 0x68, 0xd6, 0x92, 0x4e,
- 0xc8, 0xe8, 0x9e, 0x27, 0x70, 0x03, 0xbc, 0x5c, 0x6b, 0x60, 0x3e, 0xa6, 0x6d, 0x8b, 0x4e, 0xc9,
- 0x79, 0xa2, 0xb2, 0x82, 0x6b, 0x58, 0x25, 0x4a, 0x03, 0x7b, 0x36, 0xf1, 0x66, 0xfd, 0x65, 0xc7,
- 0x9b, 0xfe, 0xf4, 0x49, 0x30, 0x8f, 0x0b, 0xd0, 0x46, 0xe5, 0x7f, 0x6d, 0xbe, 0xe8, 0x36, 0x5f,
- 0xfc, 0x67, 0x73, 0x57, 0xf5, 0xa3, 0x4c, 0x3e, 0xe9, 0x14, 0x9b, 0x87, 0xcb, 0x8e, 0x47, 0x23,
- 0x42, 0x9c, 0xbe, 0xe5, 0x19, 0xb0, 0x33, 0x3c, 0xd1, 0x72, 0xe8, 0x25, 0xf1, 0xf9, 0x03, 0xb0,
- 0x01, 0x06, 0xf6, 0xab, 0x75, 0x0c, 0x6c, 0xd9, 0xd0, 0x39, 0x06, 0xb6, 0xf4, 0x25, 0x19, 0x48,
- 0xf1, 0x8e, 0x6b, 0xc1, 0x02, 0x34, 0x2b, 0x65, 0x67, 0x2f, 0x64, 0x32, 0x07, 0x93, 0xb0, 0xd0,
- 0xcd, 0x5e, 0x49, 0xfa, 0x8a, 0x04, 0xc5, 0x67, 0x95, 0xc3, 0xed, 0x3a, 0x63, 0x04, 0xa3, 0xa3,
- 0xb6, 0x13, 0x25, 0x1a, 0x78, 0x09, 0x77, 0x32, 0x03, 0x36, 0x72, 0x13, 0x35, 0x8e, 0xcd, 0xd7,
- 0x85, 0xa8, 0xf3, 0x73, 0x97, 0x37, 0x8e, 0xad, 0xed, 0x4e, 0x5f, 0xef, 0xd8, 0xd8, 0xd5, 0xae,
- 0xb5, 0xcd, 0xa4, 0x99, 0x43, 0x0a, 0x25, 0xb0, 0x8b, 0x89, 0x37, 0x3b, 0x5b, 0x1e, 0xb5, 0xdd,
- 0x56, 0xa6, 0x72, 0x59, 0x2a, 0xfd, 0x01, 0x36, 0x90, 0xb2, 0xe7, 0x6e, 0x5b, 0x6d, 0xcf, 0xfe,
- 0x52, 0xc8, 0xed, 0xfe, 0xd9, 0x25, 0xde, 0xae, 0x94, 0xad, 0xab, 0xc1, 0x80, 0xde, 0x80, 0x60,
- 0x2f, 0x5c, 0xcf, 0x5a, 0x4f, 0xbf, 0xf9, 0x64, 0x38, 0x8f, 0x91, 0xda, 0x1f, 0x74, 0xaf, 0x48,
- 0x88, 0x01, 0x2e, 0xdf, 0xf1, 0x6d, 0x8c, 0x63, 0x8a, 0x1b, 0xf4, 0x5b, 0x29, 0xee, 0xb0, 0x4e,
- 0xef, 0x76, 0x05, 0x54, 0x68, 0x1b, 0xc3, 0x4e, 0x1a, 0x7f, 0xc1, 0xc8, 0x31, 0xad, 0x94, 0xbd,
- 0x65, 0x4a, 0xae, 0x4b, 0x5c, 0x9e, 0xa3, 0xda, 0x18, 0x96, 0x18, 0xe4, 0x02, 0x33, 0xc7, 0xb7,
- 0x96, 0x4f, 0xa8, 0x04, 0xff, 0xa0, 0x12, 0x9e, 0xa4, 0x42, 0x4e, 0x50, 0x19, 0x3d, 0xa1, 0x72,
- 0x45, 0x42, 0x69, 0x6e, 0x94, 0x86, 0x0d, 0xe8, 0x0a, 0x76, 0x63, 0xb4, 0x78, 0x8c, 0x3b, 0x3c,
- 0xec, 0x8b, 0x34, 0xab, 0x5d, 0x9e, 0x20, 0x65, 0xfb, 0x22, 0x51, 0xd1, 0xd7, 0x64, 0xcc, 0x73,
- 0x9e, 0xee, 0x56, 0x16, 0x8d, 0x5e, 0x88, 0x0a, 0x72, 0xd7, 0xbc, 0x66, 0xdf, 0xf7, 0x91, 0xf7,
- 0xb8, 0x8f, 0xbc, 0x5f, 0xfb, 0xc8, 0xfb, 0x7a, 0x88, 0x7a, 0x8f, 0x87, 0xa8, 0xf7, 0xe3, 0x10,
- 0xf5, 0xe2, 0x01, 0xfe, 0x5d, 0xbc, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x22, 0xde, 0x39, 0x6b,
- 0x41, 0x04, 0x00, 0x00,
+ // 506 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xc1, 0x6e, 0xd3, 0x4c,
+ 0x14, 0x85, 0xe3, 0xf8, 0x6f, 0x62, 0x4f, 0x9a, 0xfe, 0x65, 0x16, 0x68, 0x84, 0x2a, 0x2b, 0x8a,
+ 0x58, 0x64, 0xc5, 0x86, 0x37, 0x28, 0xa1, 0x52, 0x24, 0x54, 0x21, 0xa7, 0x3c, 0xc0, 0xd8, 0x73,
+ 0x5b, 0x46, 0xb2, 0x3d, 0xd6, 0x8c, 0x13, 0x9a, 0xb7, 0xe8, 0x9b, 0xf0, 0x1a, 0x2c, 0xbb, 0x64,
+ 0xc1, 0x02, 0x25, 0x2f, 0x82, 0xe6, 0x8e, 0x1d, 0xdb, 0x45, 0x14, 0x56, 0xc9, 0x39, 0xc7, 0xbe,
+ 0x3e, 0xbe, 0xdf, 0xc8, 0x24, 0x00, 0xf3, 0xa6, 0xd4, 0xaa, 0x52, 0x34, 0xc0, 0x9f, 0xdc, 0xdc,
+ 0xcd, 0x1f, 0x3c, 0x32, 0x7a, 0x6f, 0x64, 0x71, 0xab, 0xe8, 0x19, 0x19, 0x4a, 0xc1, 0xbc, 0x99,
+ 0xb7, 0x08, 0xe3, 0xa1, 0x14, 0x94, 0x91, 0x71, 0xc5, 0x93, 0x0c, 0xa4, 0x60, 0x43, 0x34, 0x1b,
+ 0x49, 0x67, 0x64, 0x72, 0xcb, 0x53, 0xb8, 0x02, 0x5e, 0x6d, 0x34, 0x30, 0x1f, 0xd3, 0xae, 0x45,
+ 0xe7, 0xe4, 0x34, 0x55, 0x79, 0xc9, 0x35, 0xac, 0x53, 0xa5, 0x81, 0xfd, 0x37, 0xf3, 0x16, 0xc3,
+ 0xb8, 0xe7, 0xd1, 0x97, 0x64, 0x04, 0x85, 0x9d, 0xc8, 0x4e, 0x66, 0xde, 0xe2, 0x24, 0xae, 0xd5,
+ 0xfc, 0x87, 0x4f, 0x82, 0x65, 0x52, 0x82, 0x36, 0xaa, 0xf8, 0x63, 0xa9, 0x55, 0xbf, 0xd4, 0xea,
+ 0x1f, 0x4b, 0xb9, 0xa9, 0x1f, 0x65, 0xfa, 0x49, 0x67, 0x58, 0x2a, 0x8c, 0x7b, 0x1e, 0x8d, 0x08,
+ 0x71, 0xfa, 0x9a, 0xe7, 0xae, 0x58, 0x18, 0x77, 0x1c, 0x7a, 0x4e, 0x7c, 0x7e, 0x07, 0x6c, 0x84,
+ 0x81, 0xfd, 0x6b, 0x1d, 0x03, 0xf7, 0x6c, 0xec, 0x1c, 0x03, 0xf7, 0xf6, 0xc5, 0xa4, 0x78, 0xc7,
+ 0xb5, 0x60, 0x01, 0x9a, 0xb5, 0xb2, 0xdd, 0x4b, 0x99, 0x2e, 0xc1, 0xa4, 0x2c, 0x74, 0xdd, 0x6b,
+ 0x49, 0x5f, 0x91, 0xa0, 0xfc, 0xac, 0x0a, 0xb8, 0xde, 0xe4, 0x8c, 0x60, 0x74, 0xd4, 0xb6, 0x51,
+ 0xaa, 0x81, 0x57, 0x70, 0x23, 0x73, 0x60, 0x13, 0xd7, 0xa8, 0x75, 0x6c, 0xbe, 0x29, 0x45, 0x93,
+ 0x9f, 0xba, 0xbc, 0x75, 0xec, 0x6c, 0x77, 0xf5, 0xe5, 0x8e, 0x4d, 0xdd, 0xec, 0x46, 0xdb, 0x4c,
+ 0x9a, 0x25, 0x64, 0x50, 0x01, 0x3b, 0x43, 0x08, 0x47, 0x6d, 0xb7, 0x95, 0xab, 0x42, 0x56, 0x4a,
+ 0x7f, 0x80, 0x2d, 0x64, 0xec, 0x7f, 0xb7, 0xad, 0xae, 0xd7, 0x41, 0x78, 0xde, 0x45, 0x68, 0xe7,
+ 0x6a, 0x30, 0xa0, 0xb7, 0x20, 0xd8, 0x0b, 0xf7, 0xcc, 0x46, 0xcf, 0xbf, 0xfa, 0x64, 0xbc, 0x4c,
+ 0x90, 0xda, 0x6f, 0x74, 0x2f, 0x48, 0x88, 0x01, 0x2e, 0xdf, 0xf1, 0x6d, 0x8d, 0x63, 0x8a, 0x1b,
+ 0xf4, 0x3b, 0x29, 0xee, 0xb0, 0x49, 0x6f, 0x76, 0x25, 0xd4, 0x68, 0x5b, 0xc3, 0x36, 0x4d, 0xbe,
+ 0x60, 0xe4, 0x98, 0xd6, 0xca, 0xde, 0x65, 0x2a, 0xae, 0x2b, 0x5c, 0x9e, 0xa3, 0xda, 0x1a, 0x96,
+ 0x18, 0x14, 0x02, 0x33, 0xc7, 0xb7, 0x91, 0x4f, 0xa8, 0x04, 0x7f, 0xa1, 0x12, 0x3e, 0x4b, 0x85,
+ 0x3c, 0x43, 0x65, 0xf2, 0x84, 0xca, 0x05, 0x09, 0xa5, 0xb9, 0x52, 0x1a, 0xb6, 0xa0, 0x6b, 0xd8,
+ 0xad, 0xd1, 0xe1, 0x31, 0xed, 0xf1, 0xb0, 0x27, 0xd2, 0xac, 0x77, 0x45, 0x8a, 0x94, 0xed, 0x89,
+ 0x44, 0x45, 0x5f, 0x93, 0x29, 0x2f, 0x78, 0xb6, 0x5b, 0x5b, 0x34, 0x7a, 0x25, 0x6a, 0xc8, 0x7d,
+ 0xf3, 0x92, 0x7d, 0xdb, 0x47, 0xde, 0xe3, 0x3e, 0xf2, 0x7e, 0xee, 0x23, 0xef, 0xe1, 0x10, 0x0d,
+ 0x1e, 0x0f, 0xd1, 0xe0, 0xfb, 0x21, 0x1a, 0x24, 0x23, 0xfc, 0x8e, 0xbc, 0xfd, 0x15, 0x00, 0x00,
+ 0xff, 0xff, 0x71, 0xe3, 0x2f, 0x00, 0x5a, 0x04, 0x00, 0x00,
}
func (m *Esinfo) Marshal() (dAtA []byte, err error) {
@@ -500,6 +509,11 @@
i++
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
i += 4
+ }
+ if m.Enable != 0 {
+ dAtA[i] = 0x28
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.Enable))
}
return i, nil
}
@@ -762,6 +776,9 @@
if m.CompareScore != 0 {
n += 5
}
+ if m.Enable != 0 {
+ n += 1 + sovEs(uint64(m.Enable))
+ }
return n
}
@@ -908,14 +925,7 @@
}
func sovEs(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozEs(x uint64) (n int) {
return sovEs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -1056,6 +1066,25 @@
v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
iNdEx += 4
m.CompareScore = float32(math.Float32frombits(v))
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType)
+ }
+ m.Enable = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Enable |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
--
Gitblit v1.8.0