diff --git a/pkg/coprocessor/coprocessor.pb.go b/pkg/coprocessor/coprocessor.pb.go index ad63f5941..300620cf9 100644 --- a/pkg/coprocessor/coprocessor.pb.go +++ b/pkg/coprocessor/coprocessor.pb.go @@ -101,6 +101,8 @@ type Request struct { PagingSize uint64 `protobuf:"varint,10,opt,name=paging_size,json=pagingSize,proto3" json:"paging_size,omitempty"` // tasks stores the batched coprocessor tasks sent to the same tikv store. Tasks []*StoreBatchTask `protobuf:"bytes,11,rep,name=tasks,proto3" json:"tasks,omitempty"` + ConnectionId uint64 `protobuf:"varint,12,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + ConnectionAlias string `protobuf:"bytes,13,opt,name=connection_alias,json=connectionAlias,proto3" json:"connection_alias,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -216,6 +218,20 @@ func (m *Request) GetTasks() []*StoreBatchTask { return nil } +func (m *Request) GetConnectionId() uint64 { + if m != nil { + return m.ConnectionId + } + return 0 +} + +func (m *Request) GetConnectionAlias() string { + if m != nil { + return m.ConnectionAlias + } + return "" +} + type Response struct { Data github_com_pingcap_kvproto_pkg_sharedbytes.SharedBytes `protobuf:"bytes,1,opt,name=data,proto3,customtype=github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes" json:"data"` RegionError *errorpb.Error `protobuf:"bytes,2,opt,name=region_error,json=regionError,proto3" json:"region_error,omitempty"` @@ -480,6 +496,8 @@ type BatchRequest struct { // Used for partition table scan TableRegions []*TableRegions `protobuf:"bytes,7,rep,name=table_regions,json=tableRegions,proto3" json:"table_regions,omitempty"` LogId string `protobuf:"bytes,8,opt,name=log_id,json=logId,proto3" json:"log_id,omitempty"` + ConnectionId uint64 `protobuf:"varint,9,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + ConnectionAlias string `protobuf:"bytes,10,opt,name=connection_alias,json=connectionAlias,proto3" json:"connection_alias,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -574,6 +592,20 @@ func (m *BatchRequest) GetLogId() string { return "" } +func (m *BatchRequest) GetConnectionId() uint64 { + if m != nil { + return m.ConnectionId + } + return 0 +} + +func (m *BatchRequest) GetConnectionAlias() string { + if m != nil { + return m.ConnectionAlias + } + return "" +} + type BatchResponse struct { Data github_com_pingcap_kvproto_pkg_sharedbytes.SharedBytes `protobuf:"bytes,1,opt,name=data,proto3,customtype=github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes" json:"data"` OtherError string `protobuf:"bytes,2,opt,name=other_error,json=otherError,proto3" json:"other_error,omitempty"` @@ -812,70 +844,73 @@ func init() { func init() { proto.RegisterFile("coprocessor.proto", fileDescriptor_29878c170c3dd019) } var fileDescriptor_29878c170c3dd019 = []byte{ - // 1003 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x55, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xef, 0xfa, 0x7f, 0xde, 0xae, 0x1d, 0x67, 0x9a, 0xa6, 0xdb, 0x56, 0x24, 0x96, 0x91, 0x90, - 0x29, 0xe0, 0x28, 0x0e, 0x2a, 0xb7, 0x1c, 0x5c, 0x22, 0x61, 0x08, 0x12, 0x9a, 0x44, 0xb9, 0xae, - 0xc6, 0xbb, 0x93, 0xf5, 0xca, 0xce, 0xce, 0x32, 0x33, 0x89, 0x92, 0xde, 0xf8, 0x06, 0x1c, 0xb9, - 0x21, 0x71, 0xe2, 0x83, 0x70, 0xe8, 0x0d, 0x8e, 0x88, 0x43, 0x85, 0xc2, 0x37, 0xe0, 0x13, 0xa0, - 0x79, 0xb3, 0xeb, 0xd8, 0x21, 0x45, 0xe9, 0x21, 0x17, 0x4e, 0x3b, 0xef, 0xff, 0x9b, 0xf7, 0x7e, - 0xfb, 0x1b, 0x58, 0x0b, 0x45, 0x26, 0x45, 0xc8, 0x95, 0x12, 0xb2, 0x9f, 0x49, 0xa1, 0x05, 0x71, - 0x17, 0x54, 0x4f, 0x9b, 0x5c, 0x4a, 0x21, 0xb3, 0xb1, 0xb5, 0x3d, 0x6d, 0x4e, 0xcf, 0x65, 0x16, - 0xce, 0xc5, 0xf5, 0x58, 0xc4, 0x02, 0x8f, 0xdb, 0xe6, 0x94, 0x6b, 0x57, 0xe5, 0x99, 0xd2, 0x78, - 0xcc, 0x15, 0xde, 0x29, 0xd7, 0xac, 0x08, 0xea, 0x0e, 0xa0, 0xf1, 0x15, 0xbf, 0xa4, 0x2c, 0x8d, - 0x39, 0x59, 0x87, 0xaa, 0xd2, 0x4c, 0x6a, 0xdf, 0xe9, 0x38, 0x3d, 0x8f, 0x5a, 0x81, 0xb4, 0xa1, - 0xcc, 0xd3, 0xc8, 0x2f, 0xa1, 0xce, 0x1c, 0xbb, 0x3f, 0x96, 0xa1, 0x4e, 0xf9, 0xb7, 0x67, 0x5c, - 0x69, 0xf2, 0x1c, 0xea, 0xa1, 0x48, 0x35, 0xbf, 0xb0, 0x51, 0xee, 0xa0, 0xdd, 0x2f, 0xba, 0x7a, - 0x69, 0xf5, 0xb4, 0x70, 0x20, 0x2d, 0x28, 0xe9, 0x0c, 0x13, 0x95, 0x69, 0x49, 0x67, 0x84, 0x40, - 0x25, 0x62, 0x9a, 0xf9, 0x65, 0x4c, 0x8d, 0x67, 0xf2, 0x04, 0x1a, 0x58, 0x36, 0xd0, 0xca, 0xaf, - 0x77, 0x9c, 0x5e, 0x85, 0xd6, 0x51, 0x3e, 0x52, 0xe4, 0x13, 0xa8, 0x49, 0xd3, 0xa7, 0xf2, 0x2b, - 0x9d, 0x72, 0xcf, 0x1d, 0x3c, 0xea, 0x2f, 0x8e, 0xab, 0xb8, 0x05, 0xcd, 0x9d, 0x48, 0x0f, 0xda, - 0x89, 0x0a, 0x42, 0x16, 0x4e, 0x78, 0xc0, 0x53, 0x36, 0x9e, 0xf1, 0xc8, 0xaf, 0x76, 0x9c, 0x5e, - 0x83, 0xb6, 0x12, 0xf5, 0xd2, 0xa8, 0xf7, 0xad, 0x96, 0xec, 0xc2, 0x86, 0x75, 0x4b, 0x4e, 0x82, - 0x53, 0xa6, 0xc3, 0x49, 0x70, 0xce, 0xa5, 0x4a, 0x44, 0xea, 0xd7, 0xb0, 0x83, 0x87, 0x68, 0x1d, - 0x9d, 0x7c, 0x6d, 0x6c, 0xc7, 0xd6, 0x44, 0xde, 0x03, 0x50, 0xe1, 0x84, 0x9f, 0x32, 0xe3, 0xec, - 0x37, 0xf0, 0x52, 0x2b, 0x56, 0x73, 0xcc, 0x65, 0x5e, 0x5d, 0x4b, 0x16, 0x5e, 0x57, 0x5f, 0x29, - 0xaa, 0x1f, 0x19, 0x75, 0x51, 0x7d, 0x0b, 0xdc, 0x8c, 0xc5, 0x49, 0x1a, 0x07, 0x2a, 0x79, 0xc5, - 0x7d, 0xc0, 0x92, 0x60, 0x55, 0x87, 0xc9, 0x2b, 0x4e, 0x76, 0xa0, 0xaa, 0x99, 0x9a, 0x2a, 0xdf, - 0xc5, 0x6b, 0x3f, 0x5b, 0xba, 0xf6, 0xa1, 0x16, 0x92, 0x0f, 0x4d, 0x63, 0x47, 0x4c, 0x4d, 0xa9, - 0xf5, 0xec, 0x7e, 0x57, 0x85, 0x06, 0xe5, 0x2a, 0x13, 0xa9, 0xe2, 0x84, 0xe6, 0x63, 0xc6, 0xad, - 0x0e, 0xf7, 0x5e, 0xbf, 0xd9, 0x7a, 0xf0, 0xc7, 0x9b, 0xad, 0x17, 0x71, 0xa2, 0x27, 0x67, 0xe3, - 0x7e, 0x28, 0x4e, 0xb7, 0xb3, 0x24, 0x8d, 0x43, 0x96, 0x6d, 0x4f, 0xcf, 0x2d, 0x7c, 0xb2, 0x69, - 0xbc, 0xad, 0x26, 0x4c, 0xf2, 0x68, 0x7c, 0xa9, 0xb9, 0xea, 0x1f, 0xe2, 0x79, 0x68, 0xce, 0xf9, - 0x9a, 0x76, 0xc0, 0x93, 0x3c, 0x4e, 0x44, 0x1a, 0x20, 0x24, 0x71, 0xa9, 0xee, 0xa0, 0xd5, 0x2f, - 0x00, 0xba, 0x6f, 0xbe, 0xd4, 0xb5, 0x3e, 0x28, 0x90, 0x0f, 0xa1, 0x36, 0x13, 0xe1, 0x94, 0x47, - 0xb8, 0x6f, 0x77, 0xb0, 0x36, 0x07, 0xca, 0x81, 0x08, 0xa7, 0xa3, 0xf4, 0x44, 0xd0, 0xdc, 0xc1, - 0x8c, 0x44, 0xe8, 0x09, 0x97, 0x79, 0xf2, 0x4a, 0xc7, 0xe9, 0xad, 0x50, 0x40, 0x95, 0xcd, 0xf5, - 0x11, 0x54, 0x71, 0xcb, 0xb8, 0xd0, 0xb7, 0x22, 0xc1, 0xfa, 0x90, 0xcf, 0xc0, 0xe3, 0x17, 0x3c, - 0x0c, 0x22, 0xae, 0x59, 0x32, 0x53, 0xb8, 0x54, 0x77, 0xb0, 0x3e, 0x2f, 0xbf, 0x7f, 0xc1, 0xc3, - 0xcf, 0xad, 0x8d, 0xba, 0xfc, 0x5a, 0x20, 0x7b, 0xb0, 0xba, 0x18, 0x18, 0x9c, 0x0f, 0x7c, 0x17, - 0x63, 0x37, 0x6e, 0x8b, 0x3d, 0x1e, 0xd0, 0x26, 0x5f, 0x14, 0x49, 0x07, 0xbc, 0x39, 0x02, 0x27, - 0x89, 0x46, 0x3c, 0x37, 0x28, 0xe4, 0xe8, 0xfb, 0x22, 0xd1, 0xe4, 0x63, 0x20, 0xd6, 0x3c, 0x63, - 0x4a, 0xcf, 0x51, 0xd7, 0x40, 0x08, 0xb4, 0xd1, 0x72, 0xc0, 0x94, 0x2e, 0x20, 0xd7, 0x85, 0x66, - 0xc8, 0xd2, 0x60, 0xcc, 0x6d, 0xce, 0x02, 0x50, 0x6e, 0xc8, 0xd2, 0x21, 0xc7, 0x9c, 0x11, 0xf9, - 0x14, 0x36, 0x66, 0x4c, 0x73, 0xa5, 0x83, 0xf1, 0x59, 0x38, 0xe5, 0x5a, 0xcd, 0xb3, 0x7a, 0x98, - 0x75, 0xdd, 0x5a, 0x87, 0xd6, 0x58, 0x64, 0x3e, 0x80, 0xd5, 0x31, 0x02, 0x5f, 0xe6, 0xa0, 0x51, - 0x7e, 0x13, 0xc1, 0xf6, 0xfe, 0x7f, 0x81, 0x2d, 0xf7, 0xa5, 0x2d, 0x8c, 0x2d, 0x44, 0xf5, 0x65, - 0xa5, 0x01, 0x6d, 0xb7, 0xfb, 0xbd, 0x03, 0x40, 0x71, 0xff, 0x66, 0xb7, 0xe4, 0x19, 0xac, 0xe4, - 0x88, 0x49, 0x22, 0x84, 0x62, 0x85, 0x36, 0xac, 0x62, 0x14, 0x91, 0x17, 0xd7, 0x70, 0xca, 0x44, - 0x38, 0xc9, 0xe1, 0xf4, 0xb0, 0x9f, 0x53, 0x95, 0x4d, 0xb3, 0x6f, 0x4c, 0x73, 0x4c, 0x19, 0x61, - 0x81, 0x12, 0xca, 0x77, 0xa0, 0x84, 0xee, 0x29, 0x78, 0x47, 0xe6, 0xa7, 0xb3, 0xf9, 0x14, 0x79, - 0x0e, 0x6b, 0xd9, 0xe4, 0x52, 0x25, 0x21, 0x9b, 0x05, 0xda, 0x18, 0x8a, 0xde, 0xca, 0x74, 0xb5, - 0x30, 0x60, 0xc0, 0x28, 0x22, 0x3b, 0x50, 0xb7, 0x95, 0x95, 0x5f, 0xc2, 0x5a, 0x8f, 0x97, 0x6a, - 0x5d, 0xdf, 0x94, 0x16, 0x7e, 0xdd, 0x9f, 0x4a, 0xe0, 0x0d, 0xed, 0x68, 0xee, 0x87, 0x2c, 0x17, - 0x7a, 0xaa, 0xdc, 0xad, 0xa7, 0x25, 0x7e, 0xad, 0x2e, 0xf3, 0xeb, 0x32, 0xa3, 0xd5, 0x6e, 0x32, - 0xda, 0x1e, 0x34, 0xed, 0x8c, 0x8a, 0x92, 0x75, 0x2c, 0xf9, 0x64, 0xa9, 0xe4, 0xe2, 0x78, 0xa9, - 0xa7, 0x17, 0x87, 0xfd, 0xc8, 0xfc, 0xff, 0xb1, 0x99, 0x70, 0x03, 0xff, 0xe7, 0xea, 0x4c, 0xc4, - 0xa3, 0xa8, 0xfb, 0xb7, 0x03, 0xcd, 0xe1, 0x22, 0x7e, 0xee, 0x85, 0xaf, 0x6e, 0x30, 0x4a, 0xe9, - 0x5f, 0x8c, 0x72, 0x93, 0x24, 0xca, 0x77, 0x25, 0x89, 0x5d, 0x68, 0x4a, 0xae, 0xe5, 0x65, 0xb0, - 0xbc, 0x89, 0xd6, 0x32, 0x76, 0xa9, 0x87, 0x4e, 0xf9, 0x2c, 0xba, 0xbf, 0x3a, 0xd0, 0x5a, 0xfe, - 0x99, 0xee, 0xe7, 0xff, 0xe8, 0x40, 0x25, 0xe3, 0x5c, 0xe6, 0xb7, 0xf1, 0x0a, 0xff, 0x6f, 0x38, - 0x97, 0x14, 0x2d, 0xef, 0xfa, 0xa8, 0x3e, 0x86, 0xba, 0x79, 0x61, 0x4c, 0x8f, 0x16, 0x3d, 0x35, - 0x23, 0x8e, 0xa2, 0xee, 0x2f, 0x25, 0xd8, 0xb8, 0x9d, 0x1e, 0xfe, 0x8f, 0xef, 0xcf, 0xdb, 0xc6, - 0x70, 0xdb, 0x93, 0x51, 0x7b, 0x87, 0x27, 0x63, 0xf8, 0xc1, 0xef, 0x3f, 0x37, 0x9c, 0xd7, 0x57, - 0x9b, 0xce, 0x6f, 0x57, 0x9b, 0xce, 0x9f, 0x57, 0x9b, 0xce, 0x0f, 0x7f, 0x6d, 0x3e, 0x80, 0xb6, - 0x90, 0x71, 0x5f, 0x27, 0xd3, 0xf3, 0x7e, 0x3e, 0xa1, 0x71, 0x0d, 0x3f, 0xbb, 0xff, 0x04, 0x00, - 0x00, 0xff, 0xff, 0xc1, 0xb1, 0xfb, 0x7d, 0x32, 0x0a, 0x00, 0x00, + // 1051 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x55, 0xcd, 0x6e, 0x1b, 0x37, + 0x10, 0xce, 0xea, 0x77, 0x3d, 0xbb, 0x92, 0x65, 0xc6, 0x71, 0x36, 0x09, 0x6a, 0x0b, 0x0a, 0x50, + 0x28, 0x69, 0x2b, 0xc3, 0x72, 0x91, 0xde, 0x0c, 0x54, 0xa9, 0x81, 0xaa, 0x75, 0x81, 0x82, 0x36, + 0x7c, 0x5d, 0x50, 0x5c, 0x7a, 0xb5, 0x90, 0xbc, 0xdc, 0x92, 0xb4, 0x61, 0xe7, 0xd6, 0x37, 0xe8, + 0xb1, 0x8f, 0xd0, 0x07, 0xe9, 0x21, 0xb7, 0xf6, 0x58, 0xf4, 0x10, 0x14, 0xee, 0x03, 0x14, 0xc8, + 0x13, 0x14, 0x24, 0x77, 0xf5, 0xe3, 0x38, 0x85, 0x73, 0xf0, 0xa5, 0xa7, 0xe5, 0x7c, 0x33, 0x9c, + 0x19, 0x0e, 0x3f, 0x7e, 0x0b, 0x6b, 0x94, 0x67, 0x82, 0x53, 0x26, 0x25, 0x17, 0xbd, 0x4c, 0x70, + 0xc5, 0x91, 0xb7, 0x00, 0x3d, 0x6e, 0x30, 0x21, 0xb8, 0xc8, 0x46, 0xd6, 0xf7, 0xb8, 0x31, 0x39, + 0x17, 0x19, 0x9d, 0x99, 0xeb, 0x31, 0x8f, 0xb9, 0x59, 0x6e, 0xeb, 0x55, 0x8e, 0xae, 0x8a, 0x33, + 0xa9, 0xcc, 0x32, 0x07, 0xfc, 0x53, 0xa6, 0x48, 0xb1, 0xa9, 0xd3, 0x07, 0xf7, 0x5b, 0x76, 0x89, + 0x49, 0x1a, 0x33, 0xb4, 0x0e, 0x55, 0xa9, 0x88, 0x50, 0x81, 0xd3, 0x76, 0xba, 0x3e, 0xb6, 0x06, + 0x6a, 0x41, 0x99, 0xa5, 0x51, 0x50, 0x32, 0x98, 0x5e, 0x76, 0xfe, 0x29, 0x43, 0x1d, 0xb3, 0x1f, + 0xce, 0x98, 0x54, 0xe8, 0x39, 0xd4, 0x29, 0x4f, 0x15, 0xbb, 0xb0, 0xbb, 0xbc, 0x7e, 0xab, 0x57, + 0x74, 0xf5, 0xd2, 0xe2, 0xb8, 0x08, 0x40, 0x4d, 0x28, 0xa9, 0xcc, 0x24, 0x2a, 0xe3, 0x92, 0xca, + 0x10, 0x82, 0x4a, 0x44, 0x14, 0x09, 0xca, 0x26, 0xb5, 0x59, 0xa3, 0x47, 0xe0, 0x9a, 0xb2, 0xa1, + 0x92, 0x41, 0xbd, 0xed, 0x74, 0x2b, 0xb8, 0x6e, 0xec, 0x23, 0x89, 0x3e, 0x83, 0x9a, 0xd0, 0x7d, + 0xca, 0xa0, 0xd2, 0x2e, 0x77, 0xbd, 0xfe, 0x83, 0xde, 0xe2, 0xb8, 0x8a, 0x53, 0xe0, 0x3c, 0x08, + 0x75, 0xa1, 0x95, 0xc8, 0x90, 0x12, 0x3a, 0x66, 0x21, 0x4b, 0xc9, 0x68, 0xca, 0xa2, 0xa0, 0xda, + 0x76, 0xba, 0x2e, 0x6e, 0x26, 0xf2, 0xa5, 0x86, 0xf7, 0x2d, 0x8a, 0x76, 0x61, 0xc3, 0x86, 0x25, + 0x27, 0xe1, 0x29, 0x51, 0x74, 0x1c, 0x9e, 0x33, 0x21, 0x13, 0x9e, 0x06, 0x35, 0xd3, 0xc1, 0x7d, + 0xe3, 0x1d, 0x9e, 0x7c, 0xa7, 0x7d, 0xc7, 0xd6, 0x85, 0x3e, 0x02, 0x90, 0x74, 0xcc, 0x4e, 0x89, + 0x0e, 0x0e, 0x5c, 0x73, 0xa8, 0x15, 0x8b, 0x1c, 0x33, 0x91, 0x57, 0x57, 0x82, 0xd0, 0x79, 0xf5, + 0x95, 0xa2, 0xfa, 0x91, 0x86, 0x8b, 0xea, 0x5b, 0xe0, 0x65, 0x24, 0x4e, 0xd2, 0x38, 0x94, 0xc9, + 0x2b, 0x16, 0x80, 0x29, 0x09, 0x16, 0x3a, 0x4c, 0x5e, 0x31, 0xb4, 0x03, 0x55, 0x45, 0xe4, 0x44, + 0x06, 0x9e, 0x39, 0xf6, 0x93, 0xa5, 0x63, 0x1f, 0x2a, 0x2e, 0xd8, 0x40, 0x37, 0x76, 0x44, 0xe4, + 0x04, 0xdb, 0x48, 0xf4, 0x14, 0x1a, 0x94, 0xa7, 0x29, 0xa3, 0x2a, 0xe1, 0x69, 0x98, 0x44, 0x81, + 0x6f, 0xb2, 0xfa, 0x73, 0x70, 0x18, 0xa1, 0x67, 0xd0, 0x5a, 0x08, 0x22, 0xd3, 0x84, 0xc8, 0xa0, + 0xd1, 0x76, 0xba, 0x2b, 0x78, 0x75, 0x8e, 0x7f, 0xa9, 0xe1, 0xce, 0x8f, 0x55, 0x70, 0x31, 0x93, + 0x19, 0x4f, 0x25, 0x43, 0x38, 0xbf, 0x36, 0xc3, 0x92, 0xc1, 0xde, 0xeb, 0x37, 0x5b, 0xf7, 0xfe, + 0x7c, 0xb3, 0xf5, 0x22, 0x4e, 0xd4, 0xf8, 0x6c, 0xd4, 0xa3, 0xfc, 0x74, 0x3b, 0x4b, 0xd2, 0x98, + 0x92, 0x6c, 0x7b, 0x72, 0x6e, 0xe9, 0x98, 0x4d, 0xe2, 0x6d, 0x39, 0x26, 0x82, 0x45, 0xa3, 0x4b, + 0xc5, 0x64, 0xef, 0xd0, 0xac, 0x07, 0x7a, 0x9d, 0x5f, 0xfb, 0x0e, 0xf8, 0x82, 0xc5, 0xba, 0x0f, + 0x43, 0x71, 0x43, 0x12, 0xaf, 0xdf, 0xec, 0x15, 0x84, 0xdf, 0xd7, 0x5f, 0xec, 0xd9, 0x18, 0x63, + 0xa0, 0x67, 0x50, 0x9b, 0x72, 0x3a, 0x61, 0x91, 0xe1, 0x8f, 0xd7, 0x5f, 0x9b, 0x11, 0xef, 0x80, + 0xd3, 0xc9, 0x30, 0x3d, 0xe1, 0x38, 0x0f, 0xd0, 0x23, 0xe6, 0x6a, 0xcc, 0x44, 0x9e, 0xbc, 0x62, + 0x0e, 0x09, 0x06, 0xb2, 0xb9, 0x3e, 0x81, 0xaa, 0x61, 0x8d, 0x21, 0xc8, 0x7b, 0x99, 0x65, 0x63, + 0xd0, 0x17, 0xe0, 0xb3, 0x0b, 0x46, 0xc3, 0x88, 0x29, 0x92, 0x4c, 0xa5, 0x21, 0x89, 0xd7, 0x5f, + 0x9f, 0x95, 0xdf, 0xbf, 0x60, 0xf4, 0x2b, 0xeb, 0xc3, 0x1e, 0x9b, 0x1b, 0x68, 0x0f, 0x56, 0x17, + 0x37, 0x86, 0xe7, 0xfd, 0xc0, 0x33, 0x7b, 0x37, 0x6e, 0xda, 0x7b, 0xdc, 0xc7, 0x0d, 0xb6, 0x68, + 0xa2, 0x36, 0xf8, 0x33, 0x46, 0x8f, 0x13, 0x65, 0xde, 0x87, 0x8b, 0x21, 0x67, 0xf3, 0xd7, 0x89, + 0x42, 0x9f, 0x02, 0xb2, 0xee, 0x29, 0x91, 0x6a, 0xc6, 0x62, 0xd7, 0x5c, 0x7e, 0xcb, 0x78, 0x0e, + 0x88, 0x54, 0x05, 0x85, 0x3b, 0xd0, 0xa0, 0x24, 0x0d, 0x47, 0xcc, 0xe6, 0x2c, 0x08, 0xea, 0x51, + 0x92, 0x0e, 0x98, 0xc9, 0x19, 0xa1, 0xcf, 0x61, 0x63, 0x4a, 0x14, 0x93, 0x2a, 0x1c, 0x9d, 0xd1, + 0x09, 0x53, 0x72, 0x96, 0xd5, 0x52, 0x6a, 0xdd, 0x7a, 0x07, 0xd6, 0x59, 0x64, 0x3e, 0x80, 0xd5, + 0x91, 0x79, 0x48, 0x22, 0x27, 0x8d, 0x66, 0x96, 0x26, 0xef, 0xd3, 0xff, 0x22, 0x6f, 0x1e, 0x8b, + 0x9b, 0x66, 0x6f, 0x61, 0xca, 0x6f, 0x2a, 0x2e, 0xb4, 0xbc, 0xce, 0x4f, 0x0e, 0x00, 0x36, 0xf7, + 0xaf, 0xef, 0x16, 0x3d, 0x81, 0x95, 0x9c, 0x31, 0x49, 0x64, 0xa8, 0x58, 0xc1, 0xae, 0x05, 0x86, + 0x11, 0x7a, 0x31, 0xa7, 0x53, 0xc6, 0xe9, 0x38, 0xa7, 0xd3, 0xfd, 0x5e, 0x2e, 0x7d, 0x36, 0xcd, + 0xbe, 0x76, 0xcd, 0x38, 0xa5, 0x8d, 0x05, 0x89, 0x29, 0xdf, 0x42, 0x62, 0x3a, 0xa7, 0xe0, 0x1f, + 0xe9, 0x47, 0x6c, 0xf3, 0x49, 0xf4, 0x1c, 0xd6, 0xb2, 0xf1, 0xa5, 0x4c, 0x28, 0x99, 0x86, 0x4a, + 0x3b, 0x8a, 0xde, 0xca, 0x78, 0xb5, 0x70, 0x98, 0x0d, 0xc3, 0x08, 0xed, 0x40, 0xdd, 0x56, 0x96, + 0x41, 0xc9, 0xd4, 0x7a, 0xb8, 0x54, 0x6b, 0x7e, 0x52, 0x5c, 0xc4, 0x75, 0xde, 0x96, 0xc0, 0x1f, + 0xd8, 0xd1, 0xdc, 0x8d, 0xf8, 0x2e, 0xf4, 0x54, 0xb9, 0x5d, 0x4f, 0x4b, 0x7a, 0x5d, 0x5d, 0xd6, + 0xeb, 0x65, 0x85, 0xac, 0x5d, 0x57, 0xc8, 0x3d, 0x68, 0xd8, 0x19, 0x15, 0x25, 0xeb, 0xa6, 0xe4, + 0xa3, 0xa5, 0x92, 0x8b, 0xe3, 0xc5, 0xbe, 0x5a, 0x1c, 0xf6, 0x03, 0xfd, 0xfe, 0x63, 0x3d, 0x61, + 0xd7, 0xbc, 0xe7, 0xea, 0x94, 0xc7, 0xc3, 0xe8, 0x5d, 0xe9, 0x5b, 0xb9, 0xa5, 0xf4, 0xc1, 0xcd, + 0xd2, 0xf7, 0xd6, 0x81, 0xc6, 0x60, 0x91, 0x8f, 0x77, 0xa2, 0x7f, 0xd7, 0x14, 0xaa, 0xf4, 0x8e, + 0x42, 0x5d, 0x17, 0x9d, 0xf2, 0x6d, 0x45, 0x67, 0x17, 0x1a, 0x82, 0x29, 0x71, 0x19, 0x2e, 0xdf, + 0x6c, 0x73, 0xf9, 0x2d, 0x60, 0xdf, 0x04, 0xe5, 0xb3, 0xed, 0xfc, 0xe6, 0x40, 0x73, 0xf9, 0x71, + 0xde, 0xcd, 0x7b, 0x6b, 0x43, 0x25, 0x63, 0x4c, 0xe4, 0xa7, 0xf1, 0x8b, 0xf8, 0xef, 0x19, 0x13, + 0xd8, 0x78, 0x3e, 0xf4, 0xa7, 0xff, 0x10, 0xea, 0xfa, 0x0f, 0xa8, 0x7b, 0xb4, 0x6c, 0xac, 0x69, + 0x73, 0x18, 0x75, 0x7e, 0x2d, 0xc1, 0xc6, 0xcd, 0x72, 0xf3, 0x7f, 0xfc, 0x9f, 0xbd, 0x6f, 0x0c, + 0x37, 0xfd, 0x82, 0x6a, 0x1f, 0xf0, 0x0b, 0x1a, 0x7c, 0xfc, 0xc7, 0x2f, 0xae, 0xf3, 0xfa, 0x6a, + 0xd3, 0xf9, 0xfd, 0x6a, 0xd3, 0xf9, 0xeb, 0x6a, 0xd3, 0xf9, 0xf9, 0xef, 0xcd, 0x7b, 0xd0, 0xe2, + 0x22, 0xee, 0xa9, 0x64, 0x72, 0xde, 0xcb, 0x27, 0x34, 0xaa, 0x99, 0xcf, 0xee, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x4d, 0x1f, 0xa1, 0x59, 0xd2, 0x0a, 0x00, 0x00, } func (m *KeyRange) Marshal() (dAtA []byte, err error) { @@ -943,6 +978,18 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ConnectionAlias) > 0 { + i -= len(m.ConnectionAlias) + copy(dAtA[i:], m.ConnectionAlias) + i = encodeVarintCoprocessor(dAtA, i, uint64(len(m.ConnectionAlias))) + i-- + dAtA[i] = 0x6a + } + if m.ConnectionId != 0 { + i = encodeVarintCoprocessor(dAtA, i, uint64(m.ConnectionId)) + i-- + dAtA[i] = 0x60 + } if len(m.Tasks) > 0 { for iNdEx := len(m.Tasks) - 1; iNdEx >= 0; iNdEx-- { { @@ -1314,6 +1361,18 @@ func (m *BatchRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ConnectionAlias) > 0 { + i -= len(m.ConnectionAlias) + copy(dAtA[i:], m.ConnectionAlias) + i = encodeVarintCoprocessor(dAtA, i, uint64(len(m.ConnectionAlias))) + i-- + dAtA[i] = 0x52 + } + if m.ConnectionId != 0 { + i = encodeVarintCoprocessor(dAtA, i, uint64(m.ConnectionId)) + i-- + dAtA[i] = 0x48 + } if len(m.LogId) > 0 { i -= len(m.LogId) copy(dAtA[i:], m.LogId) @@ -1694,6 +1753,13 @@ func (m *Request) Size() (n int) { n += 1 + l + sovCoprocessor(uint64(l)) } } + if m.ConnectionId != 0 { + n += 1 + sovCoprocessor(uint64(m.ConnectionId)) + } + l = len(m.ConnectionAlias) + if l > 0 { + n += 1 + l + sovCoprocessor(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1841,6 +1907,13 @@ func (m *BatchRequest) Size() (n int) { if l > 0 { n += 1 + l + sovCoprocessor(uint64(l)) } + if m.ConnectionId != 0 { + n += 1 + sovCoprocessor(uint64(m.ConnectionId)) + } + l = len(m.ConnectionAlias) + if l > 0 { + n += 1 + l + sovCoprocessor(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2367,6 +2440,57 @@ func (m *Request) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 12: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType) + } + m.ConnectionId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ConnectionId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConnectionAlias", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCoprocessor + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCoprocessor + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConnectionAlias = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCoprocessor(dAtA[iNdEx:]) @@ -3297,6 +3421,57 @@ func (m *BatchRequest) Unmarshal(dAtA []byte) error { } m.LogId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType) + } + m.ConnectionId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ConnectionId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConnectionAlias", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoprocessor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCoprocessor + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCoprocessor + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConnectionAlias = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCoprocessor(dAtA[iNdEx:]) diff --git a/proto/coprocessor.proto b/proto/coprocessor.proto index 390d7674f..d0f83a0da 100644 --- a/proto/coprocessor.proto +++ b/proto/coprocessor.proto @@ -39,6 +39,8 @@ message Request { uint64 paging_size = 10; // tasks stores the batched coprocessor tasks sent to the same tikv store. repeated StoreBatchTask tasks = 11; + uint64 connection_id = 12; // This is the session id between a client and tidb + string connection_alias = 13; // This is the session alias between a client and tidb } message Response { @@ -91,6 +93,8 @@ message BatchRequest { // Used for partition table scan repeated TableRegions table_regions = 7; string log_id = 8; + uint64 connection_id = 9; // This is the session id between a client and tidb + string connection_alias = 10; // This is the session alias between a client and tidb } message BatchResponse { diff --git a/scripts/proto.lock b/scripts/proto.lock index e0621f0e5..3282a3d19 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -2658,6 +2658,16 @@ "name": "tasks", "type": "StoreBatchTask", "is_repeated": true + }, + { + "id": 12, + "name": "connection_id", + "type": "uint64" + }, + { + "id": 13, + "name": "connection_alias", + "type": "string" } ] }, @@ -2821,6 +2831,16 @@ "id": 8, "name": "log_id", "type": "string" + }, + { + "id": 9, + "name": "connection_id", + "type": "uint64" + }, + { + "id": 10, + "name": "connection_alias", + "type": "string" } ] },