diff --git a/go-tipb/select.pb.go b/go-tipb/select.pb.go index eff023cc8..d5fb7af1f 100644 --- a/go-tipb/select.pb.go +++ b/go-tipb/select.pb.go @@ -11,7 +11,6 @@ import ( _ "github.com/gogo/protobuf/gogoproto" github_com_golang_protobuf_proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto" - github_com_pingcap_tipb_sharedbytes "github.com/pingcap/tipb/sharedbytes" math_bits "math/bits" ) @@ -397,7 +396,7 @@ func (m *SelectResponse) GetIntermediateOutputs() []*IntermediateOutput { // Chunk contains multiple rows data and rows meta. type Chunk struct { // Data for all rows in the chunk. - RowsData github_com_pingcap_tipb_sharedbytes.SharedBytes `protobuf:"bytes,3,opt,name=rows_data,json=rowsData,customtype=github.com/pingcap/tipb/sharedbytes.SharedBytes" json:"rows_data"` + RowsData []byte `protobuf:"bytes,3,opt,name=rows_data,json=rowsData" json:"rows_data"` // Meta data for every row. RowsMeta []RowMeta `protobuf:"bytes,4,rep,name=rows_meta,json=rowsMeta" json:"rows_meta"` } @@ -435,6 +434,13 @@ func (m *Chunk) XXX_DiscardUnknown() { var xxx_messageInfo_Chunk proto.InternalMessageInfo +func (m *Chunk) GetRowsData() []byte { + if m != nil { + return m.RowsData + } + return nil +} + func (m *Chunk) GetRowsMeta() []RowMeta { if m != nil { return m.RowsMeta @@ -888,8 +894,8 @@ func (m *UserIdentity) GetUserHost() string { type StreamResponse struct { Error *Error `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` // Data for all rows - Data github_com_pingcap_tipb_sharedbytes.SharedBytes `protobuf:"bytes,3,opt,name=data,customtype=github.com/pingcap/tipb/sharedbytes.SharedBytes" json:"data"` - Warnings []*Error `protobuf:"bytes,4,rep,name=warnings" json:"warnings,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data" json:"data"` + Warnings []*Error `protobuf:"bytes,4,rep,name=warnings" json:"warnings,omitempty"` // output row count for each executor OutputCounts []int64 `protobuf:"varint,5,rep,name=output_counts,json=outputCounts" json:"output_counts,omitempty"` WarningCount *int64 `protobuf:"varint,6,opt,name=warning_count,json=warningCount" json:"warning_count,omitempty"` @@ -936,6 +942,13 @@ func (m *StreamResponse) GetError() *Error { return nil } +func (m *StreamResponse) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + func (m *StreamResponse) GetWarnings() []*Error { if m != nil { return m.Warnings @@ -983,82 +996,79 @@ func init() { func init() { proto.RegisterFile("select.proto", fileDescriptor_86353caa10f8b4d7) } var fileDescriptor_86353caa10f8b4d7 = []byte{ - // 1195 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcb, 0x6e, 0x1b, 0x37, - 0x17, 0xf6, 0x58, 0x92, 0x2d, 0x1d, 0x5d, 0x2c, 0xd3, 0x4e, 0x32, 0xf1, 0x9f, 0x5f, 0x71, 0x54, - 0xb4, 0x71, 0x8c, 0x40, 0x4e, 0x53, 0xa0, 0x41, 0x16, 0x6d, 0x11, 0x3b, 0x6e, 0x62, 0x24, 0x69, - 0x82, 0xb1, 0x8b, 0x02, 0xdd, 0x0c, 0xe8, 0x19, 0x5a, 0x1a, 0x78, 0x86, 0x9c, 0x90, 0x54, 0x2c, - 0xf5, 0x05, 0xba, 0x6c, 0x97, 0x7d, 0x84, 0xae, 0xfb, 0x14, 0x59, 0x66, 0x19, 0xb4, 0x40, 0x50, - 0xd8, 0x2f, 0x52, 0xf0, 0x90, 0x63, 0xcb, 0x97, 0xa0, 0x29, 0xba, 0xe8, 0x4a, 0x9c, 0xef, 0x3b, - 0x3c, 0xe4, 0xb9, 0x7c, 0x87, 0x82, 0x86, 0x62, 0x29, 0x8b, 0x74, 0x2f, 0x97, 0x42, 0x0b, 0x52, - 0xd6, 0x49, 0xbe, 0xbb, 0xd4, 0x62, 0x23, 0x16, 0x0d, 0xb5, 0x90, 0x16, 0x5d, 0x5a, 0xec, 0x8b, - 0xbe, 0xc0, 0xe5, 0x9a, 0x59, 0x39, 0x74, 0x4e, 0x0e, 0x95, 0xc6, 0xa5, 0x05, 0xba, 0x9f, 0x42, - 0x29, 0x10, 0x07, 0xe4, 0x32, 0xcc, 0x0c, 0x28, 0x8f, 0x53, 0xe6, 0x7b, 0xcb, 0xde, 0x4a, 0x23, - 0x70, 0x5f, 0x84, 0x40, 0x39, 0xa6, 0x9a, 0xfa, 0xd3, 0x88, 0xe2, 0xba, 0x7b, 0x1f, 0x2a, 0x9b, - 0x52, 0x0a, 0x49, 0x7c, 0x28, 0x47, 0x22, 0xb6, 0x5b, 0x2a, 0xeb, 0xe5, 0xd7, 0xef, 0xae, 0x4f, - 0x05, 0x88, 0x90, 0xcb, 0x50, 0xca, 0x54, 0x1f, 0x77, 0xd5, 0x1c, 0x61, 0x80, 0xee, 0x08, 0xc8, - 0x16, 0xd7, 0x4c, 0x66, 0x2c, 0x4e, 0xa8, 0x66, 0xcf, 0x87, 0x3a, 0x1f, 0x6a, 0x72, 0x0f, 0xea, - 0x8c, 0x9b, 0x7d, 0xa1, 0x1e, 0xe7, 0xd6, 0x5d, 0xeb, 0x6e, 0xbb, 0x67, 0xc2, 0xea, 0x6d, 0x22, - 0xb1, 0x33, 0xce, 0x99, 0xf3, 0x03, 0xec, 0x18, 0x21, 0xb7, 0x60, 0x26, 0x1a, 0x0c, 0xf9, 0xbe, - 0xf2, 0xa7, 0x97, 0x4b, 0x2b, 0xf5, 0xbb, 0x75, 0xbb, 0x67, 0xc3, 0x60, 0xce, 0xdc, 0x19, 0x74, - 0xff, 0x28, 0x41, 0x6b, 0x1b, 0xb3, 0x16, 0x30, 0x95, 0x0b, 0xae, 0x18, 0xb9, 0x01, 0x15, 0x66, - 0xe2, 0xc0, 0x03, 0x8f, 0x37, 0x63, 0x68, 0x81, 0x65, 0xc8, 0xff, 0xa1, 0x2c, 0xc5, 0x41, 0xe1, - 0xbe, 0x66, 0x2d, 0x02, 0x71, 0x10, 0x20, 0x3c, 0x71, 0x7e, 0xe9, 0x6f, 0xce, 0x27, 0x37, 0xa1, - 0x7a, 0x40, 0x25, 0x4f, 0x78, 0x5f, 0xf9, 0xe5, 0x49, 0x63, 0x7b, 0xde, 0x31, 0x49, 0x3e, 0x82, - 0xa6, 0xc0, 0xb4, 0x84, 0x91, 0x18, 0x72, 0xad, 0xfc, 0xca, 0x72, 0x69, 0xa5, 0x14, 0x34, 0x2c, - 0xb8, 0x81, 0x98, 0x31, 0x72, 0x1b, 0xac, 0x95, 0x3f, 0xb3, 0xec, 0x19, 0x23, 0x07, 0xa2, 0x15, - 0x79, 0x0e, 0x0b, 0xb6, 0x27, 0x12, 0xc1, 0x43, 0x35, 0xcc, 0x32, 0x2a, 0x13, 0xa6, 0xfc, 0x2a, - 0x9e, 0xde, 0x71, 0xa7, 0xbb, 0xa6, 0xd9, 0x2c, 0x0c, 0xb7, 0xd1, 0x6e, 0x1c, 0x10, 0x76, 0x1a, - 0x49, 0x98, 0x3a, 0x5b, 0xa7, 0xda, 0x07, 0xd7, 0x89, 0x40, 0x99, 0xc7, 0xaf, 0x94, 0x0f, 0x18, - 0x0a, 0xae, 0xc9, 0x13, 0x58, 0x4c, 0x26, 0x5a, 0x21, 0xb4, 0xf1, 0x29, 0xbf, 0x8e, 0xd7, 0xf3, - 0xad, 0xd7, 0xf3, 0xcd, 0x12, 0x2c, 0x24, 0xe7, 0x30, 0xd5, 0xfd, 0xc9, 0x83, 0x0a, 0x66, 0x9d, - 0xec, 0x40, 0xcd, 0x94, 0x26, 0xc4, 0xae, 0x2d, 0x99, 0xae, 0x5d, 0xbf, 0x67, 0xee, 0xf3, 0xfb, - 0xbb, 0xeb, 0x6b, 0xfd, 0x44, 0x0f, 0x86, 0xbb, 0xbd, 0x48, 0x64, 0x6b, 0x79, 0xc2, 0xfb, 0x11, - 0xcd, 0xd7, 0xcc, 0x29, 0x6b, 0x6a, 0x40, 0x25, 0x8b, 0x77, 0xc7, 0x9a, 0xa9, 0xde, 0x36, 0xae, - 0xd7, 0xcd, 0x3a, 0xa8, 0x1a, 0x4f, 0x0f, 0xa9, 0xa6, 0xe4, 0x8e, 0xf3, 0x9a, 0x31, 0x4d, 0x5d, - 0xf9, 0x9a, 0xc7, 0xcd, 0xf0, 0x8c, 0x69, 0xea, 0x82, 0xc6, 0x1d, 0xe6, 0xbb, 0xbb, 0x0f, 0x57, - 0xcf, 0x5f, 0x7e, 0x63, 0x40, 0x39, 0x67, 0x29, 0xb9, 0x09, 0x8d, 0x42, 0xad, 0x61, 0x12, 0x8f, - 0x7c, 0x6f, 0x79, 0x7a, 0xa5, 0xe9, 0x5c, 0xd4, 0x0b, 0x66, 0x2b, 0x1e, 0x91, 0x8f, 0xa1, 0xe5, - 0x9a, 0x41, 0xec, 0xed, 0x29, 0xa6, 0x6d, 0x27, 0x36, 0x03, 0xd7, 0x22, 0xcf, 0x2d, 0xd8, 0xdd, - 0x84, 0x59, 0x77, 0x0f, 0x72, 0xed, 0x94, 0x90, 0x4b, 0x45, 0x17, 0x3a, 0x39, 0x5f, 0x83, 0x99, - 0x94, 0xf1, 0xbe, 0x1e, 0xa0, 0x34, 0x8f, 0x59, 0x8b, 0x75, 0x7f, 0x9b, 0x05, 0x78, 0xf8, 0xe0, - 0x51, 0xc0, 0x5e, 0x0e, 0x99, 0xd2, 0x64, 0x15, 0xe6, 0x95, 0xa6, 0x52, 0x87, 0x5a, 0x85, 0x7b, - 0x34, 0x4d, 0x77, 0x69, 0xb4, 0x8f, 0x5e, 0xcb, 0xc1, 0x1c, 0x12, 0x3b, 0xea, 0x6b, 0x07, 0x93, - 0xdb, 0x50, 0x2b, 0xee, 0x5d, 0xa8, 0xa5, 0x75, 0xba, 0xc3, 0x82, 0x13, 0x03, 0xd2, 0x83, 0xb6, - 0x4e, 0x32, 0x16, 0xfe, 0x20, 0x38, 0x73, 0x91, 0x61, 0xad, 0x8a, 0x0b, 0xb5, 0x0c, 0xfb, 0xbd, - 0xe0, 0xcc, 0x06, 0x48, 0x96, 0xa0, 0xb2, 0x97, 0x52, 0x54, 0x8e, 0xb7, 0x52, 0x76, 0x46, 0x16, - 0xba, 0x20, 0x45, 0x95, 0x0b, 0x52, 0x44, 0xee, 0xc0, 0x62, 0x24, 0x52, 0xa3, 0xff, 0x50, 0x52, - 0xde, 0x67, 0x85, 0xba, 0x8c, 0x70, 0xaa, 0x01, 0x71, 0x5c, 0x60, 0x28, 0xa7, 0xb1, 0x55, 0x98, - 0xcf, 0xe8, 0x28, 0x3c, 0xad, 0xb3, 0x59, 0x1b, 0x7e, 0x46, 0x47, 0xdf, 0x4d, 0x4a, 0xed, 0x8c, - 0x32, 0xaa, 0x1f, 0xac, 0x8c, 0xab, 0x50, 0x55, 0x2f, 0xd3, 0x30, 0x33, 0x63, 0xb4, 0x86, 0xbe, - 0x67, 0xd5, 0xcb, 0xf4, 0x99, 0x99, 0xa1, 0xab, 0xd0, 0x3a, 0x49, 0x12, 0xa7, 0x19, 0xf3, 0xeb, - 0x13, 0xe3, 0xb4, 0x51, 0xa4, 0xe8, 0x1b, 0x9a, 0x31, 0xf2, 0x25, 0xfc, 0xaf, 0x88, 0xee, 0x22, - 0xc9, 0x37, 0x30, 0xc8, 0xab, 0xce, 0x64, 0xf3, 0xbc, 0xb2, 0x6f, 0x03, 0x31, 0xb1, 0xd2, 0x34, - 0x15, 0x07, 0x2c, 0x0e, 0x73, 0x1a, 0xed, 0x33, 0xed, 0x37, 0xf1, 0x42, 0xed, 0x8c, 0x8e, 0x1e, - 0x58, 0xe2, 0x05, 0xe2, 0xe4, 0x11, 0x2c, 0xe0, 0x54, 0x0b, 0x33, 0x96, 0x09, 0x39, 0x0e, 0x53, - 0x3a, 0x16, 0x43, 0xed, 0xb7, 0x70, 0x8c, 0x5e, 0x99, 0x98, 0x81, 0xcf, 0x90, 0x7f, 0x8a, 0x74, - 0x30, 0x1f, 0x9d, 0x85, 0x48, 0x07, 0xea, 0x89, 0x0a, 0x65, 0xce, 0x43, 0x36, 0xca, 0xa5, 0x3f, - 0x87, 0xd7, 0xac, 0x25, 0x2a, 0xc8, 0xf9, 0xe6, 0x28, 0x97, 0xe4, 0x13, 0x28, 0x0f, 0x15, 0x93, - 0x7e, 0x1b, 0x3d, 0x13, 0xeb, 0xf9, 0x5b, 0xc5, 0xe4, 0x56, 0xcc, 0xb8, 0x4e, 0xf4, 0x38, 0x40, - 0x9e, 0x7c, 0x06, 0x4d, 0x29, 0x44, 0x11, 0xbb, 0x90, 0xfe, 0x3c, 0x6e, 0x38, 0xdb, 0x81, 0x0d, - 0x63, 0x54, 0x7c, 0x99, 0xfa, 0xee, 0x09, 0x19, 0xb1, 0x70, 0xb2, 0x72, 0x04, 0xaf, 0x30, 0x87, - 0xc4, 0x49, 0xe1, 0xc8, 0xe7, 0x70, 0x25, 0x4e, 0x5e, 0x85, 0xb9, 0x64, 0x51, 0xa2, 0x4c, 0x6e, - 0x13, 0x1e, 0x49, 0x96, 0x31, 0xae, 0xfd, 0x85, 0x65, 0x6f, 0xa5, 0x19, 0x5c, 0x8a, 0x93, 0x57, - 0x2f, 0x0a, 0x76, 0xab, 0x20, 0x09, 0x85, 0x6b, 0x17, 0x0c, 0xb9, 0x30, 0xb2, 0x73, 0x40, 0xf9, - 0x8b, 0xa8, 0x94, 0xeb, 0xef, 0x1b, 0x76, 0x6e, 0x5e, 0x04, 0x4b, 0xc9, 0xfb, 0x28, 0xd5, 0xfd, - 0x0a, 0xe6, 0xcf, 0xe5, 0x9a, 0xac, 0xc2, 0x0c, 0xe3, 0x71, 0x42, 0xb9, 0x7b, 0x4c, 0x1b, 0x45, - 0x2b, 0x1a, 0xac, 0x50, 0xbd, 0xb5, 0xe8, 0xee, 0x40, 0x63, 0x32, 0xa5, 0xe4, 0x06, 0xd4, 0x4c, - 0x52, 0x6d, 0xcb, 0x79, 0x13, 0x2d, 0x57, 0x35, 0x30, 0xb6, 0x5b, 0x61, 0x32, 0x10, 0x4a, 0x9f, - 0x7a, 0xe4, 0xd1, 0xe4, 0xb1, 0x50, 0xba, 0xfb, 0xe3, 0x34, 0xb4, 0xb6, 0xb5, 0x64, 0x34, 0xfb, - 0x27, 0xef, 0xed, 0x13, 0xf7, 0x77, 0xe3, 0x5f, 0x0e, 0x6e, 0x74, 0xf2, 0x5f, 0x3c, 0xb9, 0xc5, - 0x43, 0x37, 0x7b, 0xf2, 0xd0, 0xad, 0x7e, 0x01, 0x30, 0xd1, 0x49, 0x73, 0x50, 0x37, 0xbf, 0x0f, - 0xd9, 0x1e, 0x1d, 0xa6, 0xba, 0x3d, 0x45, 0x9a, 0x50, 0x33, 0x00, 0xd6, 0xb0, 0xed, 0x15, 0xfc, - 0xc6, 0xe3, 0xf5, 0x54, 0x44, 0xfb, 0xed, 0xe9, 0xd5, 0x5b, 0x30, 0x63, 0xcb, 0x46, 0xda, 0xd0, - 0x78, 0x9a, 0x68, 0x9d, 0x32, 0xfb, 0x6d, 0xf7, 0xae, 0x27, 0x7d, 0xf7, 0xe9, 0xad, 0xdf, 0x7f, - 0xfb, 0x6b, 0xd5, 0x7b, 0x7d, 0xd8, 0xf1, 0xde, 0x1c, 0x76, 0xbc, 0x3f, 0x0f, 0x3b, 0xde, 0xcf, - 0x47, 0x9d, 0xa9, 0x5f, 0x8e, 0x3a, 0x53, 0x6f, 0x8e, 0x3a, 0x53, 0x6f, 0x8f, 0x3a, 0x53, 0x70, - 0x29, 0x12, 0x59, 0xcf, 0xa5, 0xb0, 0xa7, 0x93, 0x78, 0x17, 0x13, 0xf2, 0xc2, 0xfb, 0x2b, 0x00, - 0x00, 0xff, 0xff, 0x61, 0x62, 0x32, 0x4b, 0x52, 0x0a, 0x00, 0x00, + // 1152 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x5b, 0x6f, 0x1b, 0xc5, + 0x17, 0xf7, 0xc6, 0x97, 0xd8, 0xc7, 0x97, 0x38, 0x93, 0xb4, 0xdd, 0xe6, 0xdf, 0xbf, 0xeb, 0x1a, + 0x41, 0x5d, 0xab, 0x32, 0xa5, 0x48, 0xa0, 0x3e, 0x00, 0x6a, 0x52, 0xd3, 0x46, 0xb4, 0x24, 0xda, + 0x04, 0x21, 0x21, 0xa4, 0xd5, 0x64, 0x77, 0xec, 0xac, 0xb2, 0x3b, 0xb3, 0x99, 0x19, 0x27, 0x36, + 0x9f, 0x82, 0x47, 0x3e, 0x02, 0xcf, 0x7c, 0x8a, 0x3e, 0xf6, 0x81, 0x87, 0x4a, 0x48, 0x08, 0x25, + 0x5f, 0x04, 0xcd, 0x65, 0x93, 0xcd, 0xa5, 0xa2, 0x3c, 0xf1, 0xe4, 0x9d, 0xdf, 0xef, 0xcc, 0xcc, + 0xb9, 0xfc, 0xce, 0x19, 0x43, 0x43, 0x90, 0x98, 0x04, 0x72, 0x98, 0x72, 0x26, 0x19, 0x2a, 0xc9, + 0x28, 0xdd, 0x5b, 0x6b, 0x91, 0x19, 0x09, 0xa6, 0x92, 0x71, 0x83, 0xae, 0xad, 0x4e, 0xd8, 0x84, + 0xe9, 0xcf, 0x8f, 0xd5, 0x97, 0x45, 0x97, 0xf8, 0x54, 0x48, 0xfd, 0x69, 0x80, 0xde, 0x27, 0x50, + 0xf4, 0xd8, 0x31, 0xba, 0x09, 0x95, 0x7d, 0x4c, 0xc3, 0x98, 0xb8, 0x4e, 0xd7, 0xe9, 0x37, 0x3c, + 0xbb, 0x42, 0x08, 0x4a, 0x21, 0x96, 0xd8, 0x5d, 0xd0, 0xa8, 0xfe, 0xee, 0x3d, 0x81, 0xf2, 0x88, + 0x73, 0xc6, 0x91, 0x0b, 0xa5, 0x80, 0x85, 0x66, 0x4b, 0x79, 0xbd, 0xf4, 0xfa, 0xcf, 0xbb, 0x05, + 0x4f, 0x23, 0xe8, 0x26, 0x14, 0x13, 0x31, 0xd1, 0xbb, 0x6a, 0x96, 0x50, 0x40, 0x6f, 0x06, 0x68, + 0x93, 0x4a, 0xc2, 0x13, 0x12, 0x46, 0x58, 0x92, 0xad, 0xa9, 0x4c, 0xa7, 0x12, 0x7d, 0x0e, 0x75, + 0x42, 0xd5, 0x3e, 0x5f, 0xce, 0x53, 0x73, 0x5c, 0xeb, 0x71, 0x7b, 0xa8, 0xc2, 0x1a, 0x8e, 0x34, + 0xb1, 0x3b, 0x4f, 0x89, 0x3d, 0x07, 0xc8, 0x19, 0x82, 0x1e, 0x40, 0x25, 0xd8, 0x9f, 0xd2, 0x03, + 0xe1, 0x2e, 0x74, 0x8b, 0xfd, 0xfa, 0xe3, 0xba, 0xd9, 0xb3, 0xa1, 0x30, 0x6b, 0x6e, 0x0d, 0x7a, + 0x7f, 0x14, 0xa1, 0xb5, 0xa3, 0xb3, 0xe6, 0x11, 0x91, 0x32, 0x2a, 0x08, 0xba, 0x07, 0x65, 0xa2, + 0xe2, 0xd0, 0x17, 0x9e, 0x6d, 0xd6, 0xa1, 0x79, 0x86, 0x41, 0xff, 0x87, 0x12, 0x67, 0xc7, 0xd9, + 0xf1, 0x35, 0x63, 0xe1, 0xb1, 0x63, 0x4f, 0xc3, 0xb9, 0xfb, 0x8b, 0xff, 0x70, 0x3f, 0xba, 0x0f, + 0xd5, 0x63, 0xcc, 0x69, 0x44, 0x27, 0xc2, 0x2d, 0xe5, 0x8d, 0xcd, 0x7d, 0x67, 0x24, 0xfa, 0x00, + 0x9a, 0x4c, 0xa7, 0xc5, 0x0f, 0xd8, 0x94, 0x4a, 0xe1, 0x96, 0xbb, 0xc5, 0x7e, 0xd1, 0x6b, 0x18, + 0x70, 0x43, 0x63, 0xca, 0xc8, 0x6e, 0x30, 0x56, 0x6e, 0xa5, 0xeb, 0x28, 0x23, 0x0b, 0x6a, 0x2b, + 0xb4, 0x05, 0x2b, 0x46, 0x13, 0x11, 0xa3, 0xbe, 0x98, 0x26, 0x09, 0xe6, 0x11, 0x11, 0x6e, 0x55, + 0xdf, 0xde, 0xb1, 0xb7, 0x5b, 0xd1, 0x8c, 0x32, 0xc3, 0x1d, 0x6d, 0x37, 0xf7, 0x10, 0xb9, 0x88, + 0x44, 0x44, 0x5c, 0xae, 0x53, 0xed, 0xbd, 0xeb, 0x84, 0xa0, 0x44, 0xc3, 0x23, 0xe1, 0x82, 0x0e, + 0x45, 0x7f, 0xa3, 0x6f, 0x60, 0x35, 0xca, 0x49, 0xc1, 0x37, 0xf1, 0x09, 0xb7, 0xae, 0xdd, 0x73, + 0xcd, 0xa9, 0x57, 0xc5, 0xe2, 0xad, 0x44, 0x57, 0x30, 0xd1, 0xfb, 0x11, 0xca, 0x3a, 0xe9, 0xe8, + 0x1e, 0xd4, 0x54, 0x65, 0x7c, 0x2d, 0xda, 0xa2, 0x12, 0xad, 0x75, 0xa7, 0xaa, 0xe0, 0x67, 0x58, + 0x62, 0xf4, 0xc8, 0x9a, 0x24, 0x44, 0x62, 0x5b, 0x8a, 0xe6, 0x59, 0x61, 0x5f, 0x11, 0x89, 0xf3, + 0x3b, 0xd4, 0xba, 0x77, 0x00, 0xb7, 0xaf, 0x3a, 0xb2, 0xb1, 0x8f, 0x29, 0x25, 0x31, 0xba, 0x0f, + 0x8d, 0xac, 0xf3, 0xfc, 0x28, 0x9c, 0xb9, 0x4e, 0x77, 0xa1, 0xdf, 0xb4, 0x47, 0xd4, 0x33, 0x66, + 0x33, 0x9c, 0xa1, 0x0f, 0xa1, 0x65, 0x0b, 0xcb, 0xc6, 0x63, 0x41, 0xa4, 0x51, 0x55, 0xd3, 0xb3, + 0xe5, 0xde, 0x32, 0x60, 0x6f, 0x04, 0x8b, 0xd6, 0x0f, 0x74, 0xe7, 0x42, 0x53, 0x16, 0x33, 0x45, + 0xd9, 0xd6, 0xbc, 0x03, 0x95, 0x98, 0xd0, 0x89, 0xdc, 0xd7, 0x6d, 0x76, 0xc6, 0x1a, 0xac, 0xf7, + 0xdb, 0x22, 0xc0, 0xb3, 0xa7, 0xcf, 0x3d, 0x72, 0x38, 0x25, 0x42, 0xa2, 0x01, 0x2c, 0x0b, 0x89, + 0xb9, 0xf4, 0xa5, 0xf0, 0xc7, 0x38, 0x8e, 0xf7, 0x70, 0x70, 0xa0, 0x4f, 0x2d, 0x79, 0x4b, 0x9a, + 0xd8, 0x15, 0x5f, 0x5b, 0x18, 0x3d, 0x84, 0x5a, 0xe6, 0x77, 0xa6, 0xfc, 0xd6, 0x45, 0xb5, 0x78, + 0xe7, 0x06, 0x68, 0x08, 0x6d, 0x19, 0x25, 0xc4, 0xff, 0x89, 0x51, 0x62, 0x23, 0xd3, 0x89, 0xcf, + 0x1c, 0x6a, 0x29, 0xf6, 0x07, 0x46, 0x89, 0x09, 0x10, 0xad, 0x41, 0x79, 0x1c, 0x63, 0xdd, 0x05, + 0x4e, 0xbf, 0x64, 0x8d, 0x0c, 0x74, 0x4d, 0x8a, 0xca, 0xd7, 0xa4, 0x08, 0x3d, 0x82, 0xd5, 0x80, + 0xc5, 0xaa, 0x97, 0x7d, 0x8e, 0xe9, 0x84, 0x64, 0x9d, 0xa2, 0x9a, 0xa0, 0xea, 0x21, 0xcb, 0x79, + 0x8a, 0xb2, 0xfd, 0x32, 0x80, 0xe5, 0x04, 0xcf, 0xfc, 0x8b, 0x3d, 0xb3, 0x68, 0xc2, 0x4f, 0xf0, + 0xec, 0xfb, 0x7c, 0xdb, 0x5c, 0x52, 0x79, 0xf5, 0xbd, 0x55, 0x7e, 0x1b, 0xaa, 0xe2, 0x30, 0xf6, + 0x13, 0x35, 0x12, 0x6b, 0xfa, 0xec, 0x45, 0x71, 0x18, 0xbf, 0x52, 0xf3, 0x70, 0x00, 0xad, 0xf3, + 0x24, 0x51, 0x9c, 0x10, 0xb7, 0x9e, 0x1b, 0x8d, 0x8d, 0x2c, 0x45, 0xdf, 0xe2, 0x84, 0xa0, 0x2f, + 0xe1, 0x7f, 0x59, 0x74, 0xd7, 0xb5, 0x6f, 0x43, 0x07, 0x79, 0xdb, 0x9a, 0x8c, 0xae, 0x76, 0xe9, + 0x43, 0x40, 0x2a, 0x56, 0x1c, 0xc7, 0xec, 0x98, 0x84, 0x7e, 0x8a, 0x83, 0x03, 0x22, 0xdd, 0xa6, + 0x76, 0xa8, 0x9d, 0xe0, 0xd9, 0x53, 0x43, 0x6c, 0x6b, 0x1c, 0x3d, 0x87, 0x15, 0x3d, 0xa1, 0xfc, + 0x84, 0x24, 0x8c, 0xcf, 0xfd, 0x18, 0xcf, 0xd9, 0x54, 0xba, 0x2d, 0x3d, 0x12, 0x6f, 0xe5, 0xe6, + 0xd9, 0x2b, 0xcd, 0xbf, 0xd4, 0xb4, 0xb7, 0x1c, 0x5c, 0x86, 0x50, 0x07, 0xea, 0x91, 0xf0, 0x79, + 0x4a, 0x7d, 0x32, 0x4b, 0xb9, 0xbb, 0xa4, 0xdd, 0xac, 0x45, 0xc2, 0x4b, 0xe9, 0x68, 0x96, 0x72, + 0xf4, 0x11, 0x94, 0xa6, 0x82, 0x70, 0xb7, 0xad, 0x4f, 0x46, 0xe6, 0xe4, 0xef, 0x04, 0xe1, 0x9b, + 0x21, 0xa1, 0x32, 0x92, 0x73, 0x4f, 0xf3, 0xe8, 0x53, 0x68, 0x72, 0xc6, 0xb2, 0xd8, 0x19, 0x77, + 0x97, 0xf5, 0x86, 0xcb, 0x0a, 0x6c, 0x28, 0xa3, 0x6c, 0xa5, 0xea, 0x3b, 0x66, 0x3c, 0x20, 0x7e, + 0xbe, 0x72, 0x48, 0xbb, 0xb0, 0xa4, 0x89, 0xf3, 0xc2, 0xa1, 0xcf, 0xe0, 0x56, 0x18, 0x1d, 0xf9, + 0x29, 0x27, 0x41, 0x24, 0x54, 0x6e, 0x23, 0x1a, 0x70, 0x92, 0x10, 0x2a, 0xdd, 0x95, 0xae, 0xd3, + 0x6f, 0x7a, 0x37, 0xc2, 0xe8, 0x68, 0x3b, 0x63, 0x37, 0x33, 0x12, 0x61, 0xb8, 0x73, 0xcd, 0xc0, + 0xf2, 0x03, 0x33, 0x07, 0x84, 0xbb, 0xaa, 0x3b, 0xe5, 0xee, 0xbb, 0x06, 0x97, 0x9d, 0x17, 0xde, + 0x5a, 0xf4, 0x2e, 0x4a, 0xf4, 0xbe, 0x82, 0xe5, 0x2b, 0xb9, 0x46, 0x03, 0xa8, 0x10, 0x1a, 0x46, + 0x98, 0xda, 0x87, 0xb1, 0x91, 0x49, 0x51, 0x61, 0x59, 0xd7, 0x1b, 0x8b, 0xde, 0x2e, 0x34, 0xf2, + 0x29, 0x55, 0xe3, 0x50, 0x25, 0xd5, 0x48, 0xce, 0xc9, 0x49, 0xae, 0xaa, 0x60, 0x2d, 0xb7, 0xcc, + 0x64, 0x9f, 0x09, 0x79, 0xe1, 0xc1, 0xd6, 0x26, 0x2f, 0x98, 0x90, 0xbd, 0xdf, 0x1d, 0x68, 0xed, + 0x48, 0x4e, 0x70, 0xf2, 0x6f, 0xde, 0x4e, 0xd7, 0xfe, 0x75, 0xc8, 0x4f, 0x61, 0x8d, 0xfc, 0x17, + 0x6f, 0x61, 0xf6, 0x02, 0x2d, 0x9e, 0xbf, 0x40, 0x83, 0x2f, 0x00, 0x72, 0xb2, 0x58, 0x82, 0xba, + 0xfa, 0x7d, 0x46, 0xc6, 0x78, 0x1a, 0xcb, 0x76, 0x01, 0x35, 0xa1, 0xa6, 0x00, 0x5d, 0x90, 0xb6, + 0x93, 0xf1, 0x1b, 0x2f, 0xd6, 0x63, 0x16, 0x1c, 0xb4, 0x17, 0x06, 0x0f, 0xa0, 0x62, 0x6a, 0x80, + 0xda, 0xd0, 0x78, 0x19, 0x49, 0x19, 0x13, 0xb3, 0x36, 0x7b, 0xd7, 0xa3, 0x89, 0x5d, 0x3a, 0xeb, + 0x4f, 0xde, 0xfe, 0x5a, 0x75, 0x5e, 0x9f, 0x74, 0x9c, 0x37, 0x27, 0x1d, 0xe7, 0xaf, 0x93, 0x8e, + 0xf3, 0xf3, 0x69, 0xa7, 0xf0, 0xcb, 0x69, 0xa7, 0xf0, 0xe6, 0xb4, 0x53, 0x78, 0x7b, 0xda, 0x29, + 0xc0, 0x8d, 0x80, 0x25, 0xc3, 0x34, 0xa2, 0x93, 0x00, 0xa7, 0x43, 0x19, 0x85, 0x7b, 0x3a, 0x21, + 0xdb, 0xce, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x3d, 0x1c, 0x0b, 0xeb, 0x09, 0x00, 0x00, } func (m *Row) Marshal() (dAtA []byte, err error) { @@ -1330,16 +1340,13 @@ func (m *Chunk) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } } - { - size := m.RowsData.Size() - i -= size - if _, err := m.RowsData.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintSelect(dAtA, i, uint64(size)) + if m.RowsData != nil { + i -= len(m.RowsData) + copy(dAtA[i:], m.RowsData) + i = encodeVarintSelect(dAtA, i, uint64(len(m.RowsData))) + i-- + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x1a return len(dAtA) - i, nil } @@ -1700,16 +1707,13 @@ func (m *StreamResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } } - { - size := m.Data.Size() - i -= size - if _, err := m.Data.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintSelect(dAtA, i, uint64(size)) + if m.Data != nil { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintSelect(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x1a if m.Error != nil { { size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) @@ -1844,8 +1848,10 @@ func (m *Chunk) Size() (n int) { } var l int _ = l - l = m.RowsData.Size() - n += 1 + l + sovSelect(uint64(l)) + if m.RowsData != nil { + l = len(m.RowsData) + n += 1 + l + sovSelect(uint64(l)) + } if len(m.RowsMeta) > 0 { for _, e := range m.RowsMeta { l = e.Size() @@ -1984,8 +1990,10 @@ func (m *StreamResponse) Size() (n int) { l = m.Error.Size() n += 1 + l + sovSelect(uint64(l)) } - l = m.Data.Size() - n += 1 + l + sovSelect(uint64(l)) + if m.Data != nil { + l = len(m.Data) + n += 1 + l + sovSelect(uint64(l)) + } if len(m.Warnings) > 0 { for _, e := range m.Warnings { l = e.Size() @@ -2841,8 +2849,9 @@ func (m *Chunk) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.RowsData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.RowsData = append(m.RowsData[:0], dAtA[iNdEx:postIndex]...) + if m.RowsData == nil { + m.RowsData = []byte{} } iNdEx = postIndex case 4: @@ -3990,8 +3999,9 @@ func (m *StreamResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Data.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} } iNdEx = postIndex case 4: diff --git a/proto.lock b/proto.lock index b9baa2f4b..e9bfc1684 100644 --- a/proto.lock +++ b/proto.lock @@ -7315,10 +7315,6 @@ "type": "bytes", "optional": true, "options": [ - { - "name": "(gogoproto.customtype)", - "value": "github.com/pingcap/tipb/sharedbytes.SharedBytes" - }, { "name": "(gogoproto.nullable)", "value": "false" @@ -7566,10 +7562,6 @@ "type": "bytes", "optional": true, "options": [ - { - "name": "(gogoproto.customtype)", - "value": "github.com/pingcap/tipb/sharedbytes.SharedBytes" - }, { "name": "(gogoproto.nullable)", "value": "false" diff --git a/proto/select.proto b/proto/select.proto index 49629363e..e16b68647 100644 --- a/proto/select.proto +++ b/proto/select.proto @@ -50,7 +50,7 @@ message SelectResponse { optional int64 warning_count = 6; // Not used any more - // optional bytes row_batch_data = 7 [(gogoproto.customtype) = "github.com/pingcap/tipb/sharedbytes.SharedBytes", (gogoproto.nullable) = false]; + // optional bytes row_batch_data = 7 [(gogoproto.nullable) = false]; // The execution summary of each executor, in the order in request. repeated ExecutorExecutionSummary execution_summaries = 8; @@ -66,7 +66,7 @@ message SelectResponse { // Chunk contains multiple rows data and rows meta. message Chunk { // Data for all rows in the chunk. - optional bytes rows_data = 3 [(gogoproto.customtype) = "github.com/pingcap/tipb/sharedbytes.SharedBytes", (gogoproto.nullable) = false]; + optional bytes rows_data = 3 [(gogoproto.nullable) = false]; // Meta data for every row. repeated RowMeta rows_meta = 4 [(gogoproto.nullable) = false]; @@ -205,7 +205,7 @@ message UserIdentity { message StreamResponse { optional Error error = 1; // Data for all rows - optional bytes data = 3 [(gogoproto.customtype) = "github.com/pingcap/tipb/sharedbytes.SharedBytes", (gogoproto.nullable) = false]; + optional bytes data = 3 [(gogoproto.nullable) = false]; repeated Error warnings = 4; // output row count for each executor repeated int64 output_counts = 5; diff --git a/scripts/proto.lock b/scripts/proto.lock index 13221eba0..0928d0382 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -7610,10 +7610,6 @@ "type": "bytes", "optional": true, "options": [ - { - "name": "(gogoproto.customtype)", - "value": "github.com/pingcap/tipb/sharedbytes.SharedBytes" - }, { "name": "(gogoproto.nullable)", "value": "false" @@ -7890,10 +7886,6 @@ "type": "bytes", "optional": true, "options": [ - { - "name": "(gogoproto.customtype)", - "value": "github.com/pingcap/tipb/sharedbytes.SharedBytes" - }, { "name": "(gogoproto.nullable)", "value": "false" diff --git a/sharedbytes/sharedbytes.go b/sharedbytes/sharedbytes.go deleted file mode 100644 index 4dd461e0c..000000000 --- a/sharedbytes/sharedbytes.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2017 PingCAP, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// See the License for the specific language governing permissions and -// limitations under the License. - -package sharedbytes - -// SharedBytes is a custom type for protobuf, it does not -// allocates memory in Unmarshal. -type SharedBytes []byte - -// Marshal implements custom type for gogo/protobuf. -func (sb SharedBytes) Marshal() ([]byte, error) { - data := make([]byte, len(sb)) - copy(data, sb) - return data, nil -} - -// MarshalTo implements custom type for gogo/protobuf. -func (sb SharedBytes) MarshalTo(data []byte) (n int, err error) { - n = copy(data, sb) - return -} - -// Unmarshal implements custom type for gogo/protobuf. -func (sb *SharedBytes) Unmarshal(data []byte) error { - *sb = data - return nil -} - -// Size implements custom type for gogo/protobuf. -func (sb SharedBytes) Size() int { - return len(sb) -} diff --git a/sharedbytes/sharedbytes_test.go b/sharedbytes/sharedbytes_test.go deleted file mode 100644 index 6d19f279a..000000000 --- a/sharedbytes/sharedbytes_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package sharedbytes - -import ( - "bytes" - "testing" -) - -func TestShardBytes(t *testing.T) { - var sb SharedBytes - sb = []byte("abc") - x, err := sb.Marshal() - if err != nil { - t.Fatal(err) - } - if !bytes.Equal(x, []byte("abc")) { - t.Fatal("marshal failed") - } - x = make([]byte, 3) - sb.MarshalTo(x) - if !bytes.Equal(x, []byte("abc")) { - t.Fatal("marshal failed") - } - sb = nil - if err := sb.Unmarshal([]byte("abc")); err != nil { - t.Fatal(err) - } - if !bytes.Equal(sb, []byte("abc")) { - t.Fatal("unmarshal failed") - } -}