diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index a10cd5a9e..384bcfe5a 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -1149,7 +1149,9 @@ func (s Serializer) decodeDecimal(d *pb.Decimal, m *pql.Decimal) { // set the absolute value val.SetBytes(d.ValAbs) // convert to the correct sign - val.Mul(val, big.NewInt(d.ValSign)) + if d.ValNeg { + val.Mul(val, big.NewInt(-1)) + } // set it on the retval m.SetBigIntValue(val) } @@ -1978,7 +1980,7 @@ func (s Serializer) encodeDecimal(p *pql.Decimal) *pb.Decimal { retval := &pb.Decimal{ Scale: p.Scale, ValAbs: val.Bytes(), - ValSign: int64(val.Sign()), + ValNeg: val.Sign() < 0, NewVersion: true, } return retval diff --git a/pb/public.pb.go b/pb/public.pb.go index e9fd3aa66..835a68c83 100644 --- a/pb/public.pb.go +++ b/pb/public.pb.go @@ -1247,7 +1247,7 @@ type Decimal struct { Scale int64 `protobuf:"varint,2,opt,name=Scale,proto3" json:"Scale,omitempty"` NewVersion bool `protobuf:"varint,3,opt,name=NewVersion,proto3" json:"NewVersion,omitempty"` ValAbs []byte `protobuf:"bytes,4,opt,name=ValAbs,proto3" json:"ValAbs,omitempty"` - ValSign int64 `protobuf:"varint,5,opt,name=ValSign,proto3" json:"ValSign,omitempty"` + ValNeg bool `protobuf:"varint,5,opt,name=ValNeg,proto3" json:"ValNeg,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1314,11 +1314,11 @@ func (m *Decimal) GetValAbs() []byte { return nil } -func (m *Decimal) GetValSign() int64 { +func (m *Decimal) GetValNeg() bool { if m != nil { - return m.ValSign + return m.ValNeg } - return 0 + return false } type DistinctTimestamp struct { @@ -2681,13 +2681,13 @@ func init() { func init() { proto.RegisterFile("public.proto", fileDescriptor_413a91106d7bcce8) } var fileDescriptor_413a91106d7bcce8 = []byte{ - // 1732 bytes of a gzipped FileDescriptorProto + // 1726 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x8e, 0x2b, 0x47, 0x15, 0x9e, 0xfe, 0xf1, 0xdf, 0xb1, 0xc7, 0x77, 0xa6, 0x32, 0x09, 0x9d, 0xcb, 0xc4, 0x38, 0x2d, 0x14, 0x1c, 0x06, 0xdd, 0x08, 0x83, 0x22, 0x14, 0x09, 0xa2, 0xf1, 0x78, 0xc2, 0xb5, 0x6e, 0xee, 0xe4, 0x52, 0x1e, 0x0c, 0x8b, 0x6c, 0x7a, 0xec, 0xc2, 0x69, 0xd1, 0x76, 0x9b, 0xee, 0x76, 0x3c, - 0xf3, 0x00, 0x28, 0x3c, 0x02, 0x3b, 0x9e, 0x06, 0xc1, 0x0e, 0x96, 0x2c, 0xd1, 0x65, 0xc7, 0x53, - 0xa0, 0x73, 0xaa, 0xaa, 0xbb, 0xba, 0xed, 0x89, 0xa2, 0x88, 0x5d, 0x9f, 0x9f, 0x3a, 0x75, 0xce, + 0xf3, 0x00, 0x08, 0x1e, 0x81, 0x1d, 0x4f, 0x83, 0x60, 0x07, 0x4b, 0x96, 0xe8, 0xb2, 0xe3, 0x29, + 0xd0, 0x39, 0x55, 0xd5, 0x5d, 0xdd, 0xf6, 0x44, 0x51, 0x94, 0x5d, 0x9f, 0x9f, 0x3a, 0x75, 0xce, 0x57, 0xe7, 0xcf, 0x86, 0xce, 0x66, 0x7b, 0x17, 0x85, 0xf3, 0x67, 0x9b, 0x24, 0xce, 0x62, 0x66, 0x6f, 0xee, 0xfc, 0x07, 0x70, 0x78, 0xbc, 0x63, 0x1e, 0x34, 0xae, 0xe2, 0x68, 0xbb, 0x5a, 0xa7, 0x9e, 0xd5, 0x77, 0x06, 0x2e, 0xd7, 0x24, 0x63, 0xe0, 0xbe, 0x10, 0x0f, 0xa9, 0xe7, 0xf4, 0x9d, @@ -2704,7 +2704,7 @@ var fileDescriptor_413a91106d7bcce8 = []byte{ 0xf2, 0xcf, 0xe5, 0xf6, 0x64, 0xcc, 0x7a, 0xe0, 0xce, 0x82, 0x48, 0x1a, 0x6d, 0x0f, 0x01, 0xdd, 0x92, 0x06, 0x39, 0xf1, 0xfd, 0xcf, 0x4b, 0x46, 0x14, 0x1e, 0x6f, 0x41, 0x9d, 0x50, 0x92, 0xd7, 0xb5, 0xb8, 0xa2, 0xd8, 0x07, 0xc5, 0x43, 0x49, 0x7b, 0x6f, 0xa2, 0xbd, 0x3d, 0x27, 0xf2, 0xf7, - 0xf3, 0xdf, 0x81, 0xc6, 0x0b, 0xf1, 0x40, 0xfe, 0xeb, 0xe8, 0x2c, 0x23, 0xba, 0x7f, 0x58, 0xf0, + 0xf3, 0xdf, 0x81, 0xc6, 0x0b, 0xf1, 0x40, 0xfe, 0xeb, 0xe8, 0x2c, 0x23, 0xba, 0x7f, 0x5a, 0xf0, 0x46, 0x7e, 0xfa, 0x36, 0xb8, 0x8b, 0xc4, 0x2c, 0x88, 0xb6, 0x82, 0xf5, 0x74, 0xac, 0x56, 0xd9, 0xe7, 0xe7, 0x47, 0x14, 0x39, 0x7b, 0x37, 0x47, 0x0a, 0x15, 0xda, 0xa8, 0xa0, 0xae, 0x79, 0x7e, 0xa4, 0xb2, 0xe4, 0x1c, 0x9a, 0xa3, 0xe9, 0x84, 0xcc, 0x79, 0x4e, 0xdf, 0x1a, 0x38, 0xcf, 0x8f, @@ -2726,71 +2726,70 @@ var fileDescriptor_413a91106d7bcce8 = []byte{ 0x58, 0x85, 0x3c, 0xde, 0x15, 0x30, 0x28, 0x8a, 0x7d, 0x4f, 0xdf, 0xe2, 0x52, 0x9c, 0x2d, 0xaa, 0x0f, 0xbc, 0x5f, 0x5f, 0xf8, 0x5b, 0x80, 0x5f, 0x26, 0xf1, 0x76, 0x43, 0x10, 0x31, 0x1f, 0x6a, 0x44, 0xa9, 0x98, 0x3a, 0xa8, 0xae, 0xfd, 0xe1, 0x52, 0x74, 0x18, 0x5c, 0x7c, 0x84, 0xcb, 0xe5, - 0x52, 0x96, 0x0f, 0xc7, 0x4f, 0xff, 0x2f, 0x16, 0x34, 0x67, 0x41, 0x94, 0x8b, 0x67, 0x41, 0xa4, + 0x52, 0x96, 0x0f, 0xc7, 0x4f, 0xff, 0xaf, 0x16, 0x34, 0x67, 0x41, 0x94, 0x8b, 0x67, 0x41, 0xa4, 0x62, 0xc5, 0xcf, 0xb2, 0x19, 0x47, 0x9b, 0x79, 0x0a, 0xcd, 0x4f, 0xa2, 0x38, 0xc8, 0x50, 0x19, 0x6d, 0x59, 0x3c, 0xa7, 0xd9, 0x05, 0xc0, 0x58, 0xcc, 0xc3, 0x55, 0x10, 0xa1, 0xd4, 0x2d, 0xea, 0x59, 0x71, 0xb9, 0x21, 0x66, 0x3e, 0x74, 0x6e, 0xc3, 0x95, 0x48, 0xb3, 0x60, 0xb5, 0x41, 0x75, - 0xd9, 0xe6, 0x4b, 0x3c, 0xff, 0x2b, 0x0b, 0x1a, 0xea, 0xc8, 0xe1, 0xe7, 0x40, 0xee, 0x74, 0x1e, - 0x44, 0x42, 0x3b, 0x49, 0x04, 0xeb, 0x01, 0xdc, 0x88, 0xdd, 0x4c, 0x24, 0x69, 0x18, 0xaf, 0xc9, - 0xcd, 0x26, 0x37, 0x38, 0xf8, 0x18, 0xb3, 0x20, 0xba, 0xbc, 0x4b, 0xd5, 0xd0, 0x51, 0x14, 0x4e, - 0xa3, 0x59, 0x10, 0xe1, 0x80, 0x20, 0x77, 0x1c, 0xae, 0x49, 0xff, 0x63, 0x38, 0x1d, 0x87, 0x69, - 0x16, 0xae, 0xe7, 0x59, 0xee, 0xa1, 0x32, 0x83, 0x15, 0xae, 0x3a, 0xab, 0xa4, 0xf2, 0x32, 0xb5, - 0x8b, 0x32, 0xf5, 0xff, 0x6a, 0x41, 0xe7, 0x57, 0x5b, 0x91, 0x3c, 0x70, 0xf1, 0x87, 0xad, 0x48, - 0x33, 0xf4, 0x9c, 0x68, 0x9d, 0x3c, 0x44, 0xa0, 0xc9, 0xe9, 0x17, 0x41, 0xb2, 0x90, 0x55, 0xe7, - 0x72, 0x45, 0x51, 0xfa, 0x88, 0x55, 0x9c, 0x09, 0x72, 0xac, 0xc9, 0x15, 0xc5, 0x2e, 0xa0, 0x73, - 0xbd, 0xba, 0x13, 0x8b, 0x85, 0x58, 0x8c, 0x83, 0x2c, 0xf0, 0x9a, 0xe5, 0xa1, 0x57, 0x12, 0xb2, - 0xef, 0xc3, 0xf1, 0xab, 0x44, 0xdc, 0x26, 0xc1, 0x3a, 0x8d, 0x82, 0x4c, 0x2c, 0xbc, 0x16, 0xd9, - 0x2a, 0x33, 0xd9, 0x39, 0xb4, 0x5e, 0x06, 0xf7, 0x2f, 0xc5, 0x2a, 0x4e, 0x1e, 0x3c, 0x20, 0x18, - 0x0a, 0x86, 0xff, 0x29, 0x1c, 0xab, 0x30, 0xd2, 0x4d, 0xbc, 0x4e, 0x05, 0x26, 0xce, 0x75, 0x92, - 0xa8, 0x28, 0xf0, 0x93, 0xbd, 0x0f, 0x0d, 0x2e, 0xd2, 0x6d, 0x94, 0xe9, 0xd6, 0xf1, 0x04, 0xdd, - 0xd1, 0xa7, 0xb6, 0x51, 0xc6, 0xb5, 0xdc, 0xff, 0x6f, 0x0d, 0xda, 0x86, 0x20, 0x6f, 0x66, 0xd8, - 0x90, 0x8f, 0x65, 0x33, 0xc3, 0x51, 0xcc, 0xe3, 0xdd, 0xde, 0x94, 0xc6, 0x02, 0xec, 0x80, 0x75, - 0xa3, 0xb2, 0xdc, 0xba, 0x29, 0xea, 0xdd, 0x39, 0x5c, 0xef, 0xb8, 0x99, 0x7c, 0x11, 0xac, 0x97, - 0x62, 0x41, 0xcf, 0xde, 0xe4, 0x9a, 0x64, 0x83, 0xa2, 0x10, 0x08, 0x5f, 0x55, 0x58, 0x9a, 0xc7, - 0x8b, 0x32, 0x91, 0x65, 0x8c, 0xf3, 0xac, 0x21, 0xdf, 0x47, 0x52, 0xec, 0x43, 0xe8, 0x7e, 0x16, - 0x2d, 0x8a, 0x42, 0x4d, 0xd5, 0x4b, 0x74, 0xd1, 0x4e, 0xc1, 0xe6, 0x15, 0x2d, 0xf6, 0x51, 0x75, - 0x99, 0xa0, 0x37, 0x69, 0x0f, 0x99, 0x8a, 0xd3, 0x90, 0xf0, 0xea, 0xda, 0x71, 0x61, 0xec, 0x32, - 0xf4, 0x50, 0xed, 0xe1, 0x31, 0x1e, 0xcb, 0x99, 0xdc, 0xd8, 0x75, 0x9e, 0x99, 0xad, 0xd1, 0x6b, - 0x93, 0x76, 0x57, 0x23, 0x24, 0xb9, 0xdc, 0x6c, 0x9e, 0x17, 0x46, 0x2f, 0xf6, 0x3a, 0x85, 0xf1, - 0x9c, 0xc9, 0x8d, 0x5e, 0x7d, 0x75, 0x60, 0xef, 0xf0, 0x8e, 0xe9, 0x50, 0x75, 0xa9, 0x90, 0x42, - 0x7e, 0x60, 0x4f, 0xf9, 0xa8, 0x3a, 0xb4, 0xbc, 0x6e, 0x01, 0x45, 0x59, 0xc2, 0xab, 0xe3, 0xed, - 0xc2, 0x58, 0x00, 0xbd, 0x27, 0x85, 0xb7, 0x39, 0x93, 0x1b, 0x0b, 0xe2, 0x8f, 0xa1, 0x6d, 0x3e, - 0xd4, 0x09, 0xa9, 0x3f, 0x29, 0x3f, 0x54, 0xca, 0x4d, 0x1d, 0x0c, 0x70, 0xaf, 0xfc, 0xbd, 0xd3, - 0x22, 0xc0, 0x3d, 0x21, 0xdf, 0xd7, 0xf7, 0xff, 0x66, 0xc3, 0xf1, 0x64, 0xb5, 0x89, 0x93, 0xcc, - 0xe8, 0x01, 0x72, 0xc7, 0xb5, 0x0e, 0xee, 0xb8, 0x76, 0x65, 0xac, 0x50, 0x2f, 0xa0, 0x76, 0xe6, - 0x72, 0x49, 0x18, 0xf9, 0xe8, 0x96, 0xf2, 0xf1, 0x1c, 0x5a, 0x72, 0x2a, 0xa3, 0xa8, 0x46, 0xa2, - 0x82, 0x21, 0xb7, 0xee, 0x1d, 0x6d, 0x5d, 0x0d, 0xea, 0x5c, 0x9a, 0xc4, 0xce, 0x29, 0xd5, 0x48, - 0xd8, 0x24, 0xa1, 0xc1, 0x41, 0x79, 0x1e, 0x50, 0xea, 0xd5, 0xfb, 0xce, 0xc0, 0xe1, 0x06, 0x87, - 0xbd, 0x07, 0x5d, 0x0a, 0xe2, 0x2a, 0x11, 0xd8, 0x4c, 0x2e, 0x33, 0xca, 0x67, 0x87, 0x57, 0xb8, - 0xa8, 0x47, 0x61, 0x15, 0x7a, 0xb2, 0xd3, 0x54, 0xb8, 0x34, 0x84, 0x22, 0x11, 0x24, 0x94, 0xb1, - 0x4d, 0x2e, 0x09, 0xff, 0x5f, 0x36, 0x30, 0x89, 0xa4, 0xdc, 0xa0, 0xfe, 0x6f, 0x70, 0x7e, 0x3d, - 0x6c, 0x65, 0x70, 0x1a, 0x7b, 0xe0, 0x14, 0xf3, 0x40, 0x02, 0xa3, 0xe7, 0x41, 0x1f, 0xda, 0x7a, - 0x46, 0xa2, 0x10, 0x51, 0xb5, 0xb8, 0xc9, 0xc2, 0x61, 0x38, 0xcd, 0xf0, 0x67, 0x8f, 0x52, 0x69, - 0x91, 0xed, 0x12, 0xef, 0x00, 0xb4, 0xf0, 0x0d, 0xa1, 0x6d, 0x7f, 0x3d, 0xb4, 0x1d, 0x13, 0xda, - 0xaf, 0x2c, 0xe8, 0x5c, 0x66, 0xf1, 0x2a, 0x9c, 0x73, 0x31, 0x8f, 0x93, 0xc5, 0xe3, 0xa0, 0x4a, - 0xf8, 0x6c, 0x13, 0xbe, 0x01, 0x38, 0x93, 0x2f, 0x13, 0xd5, 0x7f, 0xdf, 0xa2, 0x55, 0x66, 0xef, - 0x95, 0x38, 0xaa, 0xb0, 0x77, 0xc1, 0x9e, 0x24, 0x94, 0xb3, 0xed, 0xe1, 0x69, 0xa1, 0xa8, 0x75, - 0xec, 0x49, 0xe2, 0xff, 0x08, 0xce, 0xa4, 0x23, 0x5a, 0xa4, 0x06, 0xce, 0x19, 0xd4, 0xae, 0x93, - 0x24, 0xd6, 0x23, 0x47, 0x12, 0xb8, 0xab, 0xe7, 0x33, 0x0c, 0x1f, 0xe3, 0xdb, 0xe4, 0xc4, 0xa1, - 0x1f, 0xa8, 0x7d, 0x68, 0xdf, 0xc4, 0xd9, 0x6f, 0x92, 0x30, 0xa3, 0x96, 0x24, 0x07, 0x87, 0xc9, - 0xf2, 0xdf, 0x87, 0x37, 0x2b, 0x37, 0x17, 0x93, 0x11, 0xd3, 0xc8, 0x29, 0x7e, 0xe4, 0x4d, 0xe1, - 0x8d, 0x5c, 0x75, 0x32, 0xfe, 0x56, 0x3e, 0xee, 0x1b, 0xfd, 0xa1, 0x11, 0x39, 0x19, 0x55, 0xd7, - 0x1f, 0x88, 0xc6, 0x1f, 0x81, 0xa7, 0xd0, 0x94, 0xbf, 0xb2, 0x95, 0x07, 0xb3, 0x50, 0xec, 0x1e, - 0xfb, 0x71, 0x41, 0x6b, 0x85, 0x4d, 0x6b, 0x12, 0x7d, 0xfb, 0x7f, 0xb2, 0xe1, 0xec, 0x90, 0x91, - 0x22, 0xa1, 0x2c, 0x23, 0xa1, 0xd8, 0x10, 0x6a, 0x5f, 0x86, 0x62, 0xa7, 0x77, 0x81, 0x73, 0xe3, - 0xb1, 0xf7, 0x7c, 0xe0, 0x52, 0x15, 0x0b, 0xe9, 0x72, 0x9e, 0xe9, 0xdd, 0xad, 0xc5, 0x15, 0x85, - 0x37, 0x8c, 0xa2, 0x78, 0xfe, 0x7b, 0xf9, 0x3b, 0x8f, 0x4b, 0xe2, 0x40, 0x61, 0xd4, 0xbe, 0x61, - 0x61, 0xd4, 0x0f, 0x16, 0xc6, 0x00, 0x9e, 0xfc, 0x7a, 0xb3, 0x08, 0x32, 0x71, 0x7d, 0x1f, 0xa6, - 0x99, 0x58, 0xcf, 0x85, 0xd7, 0xa0, 0x88, 0xaa, 0x6c, 0xff, 0x8f, 0x16, 0x1c, 0xab, 0x28, 0xa4, - 0xe8, 0x91, 0x9f, 0x04, 0x0c, 0x5c, 0x0c, 0x4f, 0x2f, 0x84, 0x04, 0x77, 0x8e, 0x96, 0x43, 0xd8, - 0x2a, 0xb4, 0x4e, 0xc0, 0x99, 0x8a, 0x4c, 0xad, 0xa5, 0xf8, 0x89, 0xad, 0x81, 0x44, 0xb2, 0x1c, - 0x53, 0xb5, 0xff, 0x95, 0x78, 0xfe, 0xe7, 0xf0, 0x76, 0x09, 0x52, 0xaa, 0x46, 0xfd, 0x2c, 0xc5, - 0xea, 0x68, 0x95, 0x56, 0xc7, 0x1f, 0x40, 0x6d, 0x66, 0x3c, 0xcc, 0xa9, 0x9c, 0x97, 0x46, 0x30, - 0x5c, 0xca, 0xfd, 0x69, 0x69, 0x5e, 0x62, 0x8f, 0xbc, 0x5c, 0x2e, 0x13, 0xb1, 0x0c, 0x32, 0x9d, - 0x2c, 0x05, 0x83, 0xbd, 0x07, 0x75, 0x52, 0xd6, 0x66, 0xab, 0x0b, 0x90, 0x92, 0x8e, 0x4e, 0xfe, - 0xfe, 0xba, 0x67, 0xfd, 0xf3, 0x75, 0xcf, 0xfa, 0xf7, 0xeb, 0x9e, 0xf5, 0xe7, 0xff, 0xf4, 0x8e, - 0xee, 0xea, 0xf4, 0x57, 0xd2, 0x4f, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x81, 0x34, 0x76, 0x53, - 0x5a, 0x12, 0x00, 0x00, + 0xd9, 0xe6, 0x4b, 0x3c, 0xff, 0x8f, 0x16, 0x34, 0xd4, 0x91, 0xc3, 0xcf, 0x81, 0xdc, 0xe9, 0x3c, + 0x88, 0x84, 0x76, 0x92, 0x08, 0xd6, 0x03, 0xb8, 0x11, 0xbb, 0x99, 0x48, 0xd2, 0x30, 0x5e, 0x93, + 0x9b, 0x4d, 0x6e, 0x70, 0xf0, 0x31, 0x66, 0x41, 0x74, 0x79, 0x97, 0xaa, 0xa1, 0xa3, 0x28, 0xc5, + 0xc7, 0xc6, 0x5f, 0xa3, 0x33, 0x8a, 0xf2, 0x3f, 0x86, 0xd3, 0x71, 0x98, 0x66, 0xe1, 0x7a, 0x9e, + 0xe5, 0xfe, 0x29, 0x65, 0xac, 0x6f, 0xd5, 0x57, 0x25, 0x95, 0x17, 0xa9, 0x5d, 0x14, 0xa9, 0xff, + 0x37, 0x0b, 0x3a, 0xbf, 0xda, 0x8a, 0xe4, 0x81, 0x8b, 0x3f, 0x6c, 0x45, 0x9a, 0xa1, 0xdf, 0x44, + 0xeb, 0xd4, 0x21, 0x02, 0x4d, 0x4e, 0xbf, 0x08, 0x92, 0x85, 0xac, 0x39, 0x97, 0x2b, 0x8a, 0x92, + 0x47, 0xac, 0xe2, 0x4c, 0x68, 0xbf, 0x24, 0xc5, 0x2e, 0xa0, 0x73, 0xbd, 0xba, 0x13, 0x8b, 0x85, + 0x58, 0x8c, 0x83, 0x2c, 0xf0, 0x9a, 0xe5, 0x91, 0x57, 0x12, 0xb2, 0xef, 0xc3, 0xf1, 0xab, 0x44, + 0xdc, 0x26, 0xc1, 0x3a, 0x8d, 0x82, 0x4c, 0x2c, 0xbc, 0x16, 0xd9, 0x2a, 0x33, 0xd9, 0x39, 0xb4, + 0x5e, 0x06, 0xf7, 0x2f, 0xc5, 0x2a, 0x4e, 0x1e, 0x3c, 0x20, 0x50, 0x0b, 0x86, 0xff, 0x29, 0x1c, + 0xab, 0x30, 0xd2, 0x4d, 0xbc, 0x4e, 0x05, 0xa6, 0xcd, 0x75, 0x92, 0xa8, 0x28, 0xf0, 0x93, 0xbd, + 0x0f, 0x0d, 0x2e, 0xd2, 0x6d, 0x94, 0xe9, 0xc6, 0xf1, 0x04, 0xdd, 0xd1, 0xa7, 0xb6, 0x51, 0xc6, + 0xb5, 0xdc, 0xff, 0x5f, 0x0d, 0xda, 0x86, 0x20, 0x6f, 0x65, 0xd8, 0x8e, 0x8f, 0x65, 0x2b, 0xc3, + 0x41, 0xcc, 0xe3, 0xdd, 0xde, 0x8c, 0xc6, 0xf2, 0xeb, 0x80, 0x75, 0xa3, 0x72, 0xdc, 0xba, 0x29, + 0xaa, 0xdd, 0x39, 0x5c, 0xed, 0xb8, 0x97, 0x7c, 0x11, 0xac, 0x97, 0x62, 0x41, 0x8f, 0xde, 0xe4, + 0x9a, 0x64, 0x83, 0xa2, 0x0c, 0x08, 0x5f, 0x55, 0x56, 0x9a, 0xc7, 0x8b, 0x22, 0x91, 0x45, 0x8c, + 0xd3, 0xac, 0x21, 0xdf, 0x47, 0x52, 0xec, 0x43, 0xe8, 0x7e, 0x16, 0x2d, 0x8a, 0x32, 0x4d, 0xd5, + 0x4b, 0x74, 0xd1, 0x4e, 0xc1, 0xe6, 0x15, 0x2d, 0xf6, 0x51, 0x75, 0x95, 0xa0, 0x37, 0x69, 0x0f, + 0x99, 0x8a, 0xd3, 0x90, 0xf0, 0xea, 0xd2, 0x71, 0x61, 0x6c, 0x32, 0xf4, 0x50, 0xed, 0xe1, 0x31, + 0x1e, 0xcb, 0x99, 0xdc, 0xd8, 0x74, 0x9e, 0x99, 0x8d, 0xd1, 0x6b, 0x93, 0x76, 0x57, 0x23, 0x24, + 0xb9, 0xdc, 0x6c, 0x9d, 0x17, 0x46, 0x27, 0xf6, 0x3a, 0x85, 0xf1, 0x9c, 0xc9, 0x8d, 0x4e, 0x7d, + 0x75, 0x60, 0xeb, 0xf0, 0x8e, 0xe9, 0x50, 0x75, 0xa5, 0x90, 0x42, 0x7e, 0x60, 0x4b, 0xf9, 0xa8, + 0x3a, 0xb2, 0xbc, 0x6e, 0x01, 0x45, 0x59, 0xc2, 0xab, 0xc3, 0xed, 0xc2, 0x58, 0xff, 0xbc, 0x27, + 0x85, 0xb7, 0x39, 0x93, 0x1b, 0xeb, 0xe1, 0x8f, 0xa1, 0x6d, 0x3e, 0xd4, 0x09, 0xa9, 0x3f, 0x29, + 0x3f, 0x54, 0xca, 0x4d, 0x1d, 0x0c, 0x70, 0xaf, 0xfc, 0xbd, 0xd3, 0x22, 0xc0, 0x3d, 0x21, 0xdf, + 0xd7, 0xf7, 0xff, 0x6e, 0xc3, 0xf1, 0x64, 0xb5, 0x89, 0x93, 0xcc, 0xe8, 0x01, 0x72, 0xc3, 0xb5, + 0x0e, 0x6e, 0xb8, 0x76, 0x65, 0xa8, 0x50, 0x2f, 0xa0, 0x66, 0xe6, 0x72, 0x49, 0x18, 0xf9, 0xe8, + 0x96, 0xf2, 0xf1, 0x1c, 0x5a, 0x72, 0x26, 0xa3, 0xa8, 0x46, 0xa2, 0x82, 0x21, 0x77, 0xee, 0x1d, + 0xed, 0x5c, 0x0d, 0xea, 0x5c, 0x9a, 0xc4, 0xbe, 0x29, 0xd5, 0x48, 0xd8, 0x24, 0xa1, 0xc1, 0x41, + 0x79, 0x1e, 0x50, 0xea, 0xd5, 0xfb, 0xce, 0xc0, 0xe1, 0x06, 0x87, 0xbd, 0x07, 0x5d, 0x0a, 0xe2, + 0x2a, 0x11, 0xd8, 0x4c, 0x2e, 0x33, 0xca, 0x67, 0x87, 0x57, 0xb8, 0xa8, 0x47, 0x61, 0x15, 0x7a, + 0xb2, 0xd3, 0x54, 0xb8, 0x34, 0x82, 0x22, 0x11, 0x24, 0x94, 0xb1, 0x4d, 0x2e, 0x09, 0xff, 0xdf, + 0x36, 0x30, 0x89, 0xa4, 0xdc, 0x9f, 0xbe, 0x35, 0x38, 0xbf, 0x1a, 0xb6, 0x32, 0x38, 0x8d, 0x3d, + 0x70, 0x8a, 0x79, 0x20, 0x81, 0xd1, 0xf3, 0xa0, 0x0f, 0x6d, 0x3d, 0x21, 0x51, 0x88, 0xa8, 0x5a, + 0xdc, 0x64, 0xe1, 0x28, 0x9c, 0x66, 0xf8, 0xa3, 0x47, 0xa9, 0xb4, 0xc8, 0x76, 0x89, 0x77, 0x00, + 0x5a, 0xf8, 0x9a, 0xd0, 0xb6, 0xbf, 0x1a, 0xda, 0x8e, 0x09, 0xed, 0x9f, 0x2c, 0xe8, 0x5c, 0x66, + 0xf1, 0x2a, 0x9c, 0x73, 0x31, 0x8f, 0x93, 0xc5, 0xe3, 0xa0, 0x4a, 0xf8, 0x6c, 0x13, 0xbe, 0x01, + 0x38, 0x93, 0x2f, 0x13, 0xd5, 0x7f, 0xdf, 0xa2, 0x45, 0x66, 0xef, 0x95, 0x38, 0xaa, 0xb0, 0x77, + 0xc1, 0x9e, 0x24, 0x94, 0xb3, 0xed, 0xe1, 0x69, 0xa1, 0xa8, 0x75, 0xec, 0x49, 0xe2, 0xff, 0x08, + 0xce, 0xa4, 0x23, 0x5a, 0xa4, 0x06, 0xce, 0x19, 0xd4, 0xae, 0x93, 0x24, 0xd6, 0x23, 0x47, 0x12, + 0xb8, 0xa9, 0xe7, 0x33, 0x0c, 0x1f, 0xe3, 0x9b, 0xe4, 0xc4, 0xa1, 0x9f, 0xa7, 0x7d, 0x68, 0xdf, + 0xc4, 0xd9, 0x6f, 0x92, 0x30, 0xa3, 0x96, 0x24, 0x07, 0x87, 0xc9, 0xf2, 0xdf, 0x87, 0x37, 0x2b, + 0x37, 0x17, 0x93, 0x11, 0xd3, 0xc8, 0x29, 0x7e, 0xe2, 0x4d, 0xe1, 0x8d, 0x5c, 0x75, 0x32, 0xfe, + 0x46, 0x3e, 0xee, 0x1b, 0xfd, 0xa1, 0x11, 0x39, 0x19, 0x55, 0xd7, 0x1f, 0x88, 0xc6, 0x1f, 0x81, + 0xa7, 0xd0, 0x94, 0xbf, 0xb1, 0x95, 0x07, 0xb3, 0x50, 0xec, 0x1e, 0xfb, 0x69, 0x41, 0x6b, 0x85, + 0x4d, 0x4b, 0x12, 0x7d, 0xfb, 0x7f, 0xb6, 0xe1, 0xec, 0x90, 0x91, 0x22, 0xa1, 0x2c, 0x23, 0xa1, + 0xd8, 0x10, 0x6a, 0x5f, 0x86, 0x62, 0xa7, 0x77, 0x81, 0x73, 0xe3, 0xb1, 0xf7, 0x7c, 0xe0, 0x52, + 0x15, 0x0b, 0xe9, 0x72, 0x9e, 0xe9, 0xcd, 0xad, 0xc5, 0x15, 0x85, 0x37, 0x8c, 0xa2, 0x78, 0xfe, + 0x7b, 0xf9, 0x2b, 0x8f, 0x4b, 0xe2, 0x40, 0x61, 0xd4, 0xbe, 0x66, 0x61, 0xd4, 0x0f, 0x16, 0xc6, + 0x00, 0x9e, 0xfc, 0x7a, 0xb3, 0x08, 0x32, 0x71, 0x7d, 0x1f, 0xa6, 0x99, 0x58, 0xcf, 0x85, 0xd7, + 0xa0, 0x88, 0xaa, 0x6c, 0xdc, 0x4e, 0x8f, 0x55, 0x14, 0x52, 0xf4, 0xc8, 0x0f, 0x02, 0x06, 0x2e, + 0x86, 0xa7, 0x17, 0x42, 0x82, 0x3b, 0x47, 0xcb, 0x21, 0x6c, 0x15, 0x5a, 0x27, 0xe0, 0x4c, 0x45, + 0xa6, 0x96, 0x52, 0xfc, 0xc4, 0xd6, 0x40, 0x22, 0x59, 0x8e, 0xa9, 0xda, 0xff, 0x4a, 0x3c, 0xff, + 0x73, 0x78, 0xbb, 0x04, 0x29, 0x55, 0xa3, 0x7e, 0x96, 0x62, 0x75, 0xb4, 0x4a, 0xab, 0xe3, 0x0f, + 0xa0, 0x36, 0x33, 0x1e, 0xe6, 0x54, 0xce, 0x4b, 0x23, 0x18, 0x2e, 0xe5, 0xfe, 0xb4, 0x34, 0x2f, + 0xb1, 0x47, 0x5e, 0x2e, 0x97, 0x89, 0x58, 0x06, 0x99, 0x4e, 0x96, 0x82, 0xc1, 0xde, 0x83, 0x3a, + 0x29, 0x6b, 0xb3, 0xd5, 0x05, 0x48, 0x49, 0x47, 0x27, 0xff, 0x78, 0xdd, 0xb3, 0xfe, 0xf5, 0xba, + 0x67, 0xfd, 0xe7, 0x75, 0xcf, 0xfa, 0xcb, 0x7f, 0x7b, 0x47, 0x77, 0x75, 0xfa, 0x23, 0xe9, 0x27, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x42, 0x09, 0xf4, 0x7d, 0x58, 0x12, 0x00, 0x00, } func (m *Row) Marshal() (dAtA []byte, err error) { @@ -3861,8 +3860,13 @@ func (m *Decimal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.ValSign != 0 { - i = encodeVarintPublic(dAtA, i, uint64(m.ValSign)) + if m.ValNeg { + i-- + if m.ValNeg { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } i-- dAtA[i] = 0x28 } @@ -5697,8 +5701,8 @@ func (m *Decimal) Size() (n int) { if l > 0 { n += 1 + l + sovPublic(uint64(l)) } - if m.ValSign != 0 { - n += 1 + sovPublic(uint64(m.ValSign)) + if m.ValNeg { + n += 2 } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -8926,9 +8930,9 @@ func (m *Decimal) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ValSign", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ValNeg", wireType) } - m.ValSign = 0 + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowPublic @@ -8938,11 +8942,12 @@ func (m *Decimal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ValSign |= int64(b&0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } } + m.ValNeg = bool(v != 0) default: iNdEx = preIndex skippy, err := skipPublic(dAtA[iNdEx:]) diff --git a/pb/public.proto b/pb/public.proto index 9a4be75b6..5f44ad807 100644 --- a/pb/public.proto +++ b/pb/public.proto @@ -117,7 +117,7 @@ message Decimal { int64 Scale = 2; bool NewVersion = 3; bytes ValAbs = 4; - int64 ValSign = 5; + bool ValNeg = 5; } message DistinctTimestamp {