From 83cbb666bf129770533e0e3509de53d24f999470 Mon Sep 17 00:00:00 2001 From: xzhangxian1008 Date: Wed, 8 Nov 2023 18:18:56 +0800 Subject: [PATCH] Add connection_id and connection_alias inTaskMeta --- pkg/configpb/configpb.pb.gw.go | 22 +++- pkg/mpp/mpp.pb.go | 204 ++++++++++++++++++++++++--------- proto/mpp.proto | 2 + scripts/proto.lock | 10 ++ 4 files changed, 180 insertions(+), 58 deletions(-) diff --git a/pkg/configpb/configpb.pb.gw.go b/pkg/configpb/configpb.pb.gw.go index c0385b0e4..9b4675b32 100644 --- a/pkg/configpb/configpb.pb.gw.go +++ b/pkg/configpb/configpb.pb.gw.go @@ -20,6 +20,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" ) @@ -30,6 +31,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = descriptor.ForMessage +var _ = metadata.Join var ( filter_Config_Get_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} @@ -55,7 +57,10 @@ func local_request_Config_Get_0(ctx context.Context, marshaler runtime.Marshaler var protoReq GetRequest var metadata runtime.ServerMetadata - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Config_Get_0); err != nil { + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Get_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -122,7 +127,10 @@ func local_request_Config_Delete_0(ctx context.Context, marshaler runtime.Marsha var protoReq DeleteRequest var metadata runtime.ServerMetadata - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Config_Delete_0); err != nil { + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Delete_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -134,11 +142,14 @@ func local_request_Config_Delete_0(ctx context.Context, marshaler runtime.Marsha // RegisterConfigHandlerServer registers the http handlers for service Config to "mux". // UnaryRPC :call ConfigServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterConfigHandlerFromEndpoint instead. func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ConfigServer) error { mux.Handle("GET", pattern_Config_Get_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -146,6 +157,7 @@ func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser return } resp, md, err := local_request_Config_Get_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -159,6 +171,8 @@ func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser mux.Handle("POST", pattern_Config_Update_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -166,6 +180,7 @@ func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser return } resp, md, err := local_request_Config_Update_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -179,6 +194,8 @@ func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser mux.Handle("DELETE", pattern_Config_Delete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -186,6 +203,7 @@ func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser return } resp, md, err := local_request_Config_Delete_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) diff --git a/pkg/mpp/mpp.pb.go b/pkg/mpp/mpp.pb.go index 2b8bcbac1..0176f08fd 100644 --- a/pkg/mpp/mpp.pb.go +++ b/pkg/mpp/mpp.pb.go @@ -43,6 +43,8 @@ type TaskMeta struct { ReportExecutionSummary bool `protobuf:"varint,12,opt,name=report_execution_summary,json=reportExecutionSummary,proto3" json:"report_execution_summary,omitempty"` ApiVersion kvrpcpb.APIVersion `protobuf:"varint,16,opt,name=api_version,json=apiVersion,proto3,enum=kvrpcpb.APIVersion" json:"api_version,omitempty"` ResourceGroupName string `protobuf:"bytes,17,opt,name=resource_group_name,json=resourceGroupName,proto3" json:"resource_group_name,omitempty"` + ConnectionId uint64 `protobuf:"varint,18,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + ConnectionAlias string `protobuf:"bytes,19,opt,name=connection_alias,json=connectionAlias,proto3" json:"connection_alias,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -179,6 +181,20 @@ func (m *TaskMeta) GetResourceGroupName() string { return "" } +func (m *TaskMeta) GetConnectionId() uint64 { + if m != nil { + return m.ConnectionId + } + return 0 +} + +func (m *TaskMeta) GetConnectionAlias() string { + if m != nil { + return m.ConnectionAlias + } + return "" +} + type IsAliveRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -852,62 +868,64 @@ func init() { func init() { proto.RegisterFile("mpp.proto", fileDescriptor_819623c7fa76fc55) } var fileDescriptor_819623c7fa76fc55 = []byte{ - // 874 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xc1, 0x6e, 0xdb, 0x46, - 0x10, 0x2d, 0x45, 0xd9, 0x92, 0x46, 0x94, 0x6b, 0xaf, 0x83, 0x98, 0x49, 0x1b, 0x57, 0x21, 0x7a, - 0xd0, 0x89, 0x41, 0x9d, 0xa2, 0xe8, 0xa1, 0x28, 0xe0, 0x26, 0x46, 0xc1, 0x83, 0x03, 0x75, 0x63, - 0x04, 0xbd, 0x11, 0x6b, 0x72, 0x2a, 0x11, 0x12, 0xb9, 0x9b, 0xdd, 0xa5, 0x50, 0x9f, 0x7b, 0x28, - 0xfa, 0x03, 0x45, 0x3f, 0xa9, 0xc7, 0x7e, 0x42, 0xe1, 0xfe, 0x48, 0xb1, 0xbb, 0x5c, 0xc5, 0x71, - 0x62, 0x20, 0x39, 0x69, 0xe7, 0xcd, 0xec, 0xcc, 0x9b, 0xd9, 0x37, 0x14, 0x8c, 0x6a, 0x21, 0x52, - 0x21, 0xb9, 0xe6, 0x24, 0xac, 0x85, 0x78, 0x78, 0x6f, 0xc1, 0x17, 0xdc, 0xda, 0x4f, 0xcc, 0xc9, - 0xb9, 0x1e, 0x1e, 0x14, 0x06, 0x2b, 0x50, 0x29, 0x2e, 0x3b, 0x28, 0xaa, 0x51, 0x33, 0x71, 0xd9, - 0x59, 0x93, 0xd5, 0x46, 0x8a, 0xc2, 0x9b, 0xc9, 0x1f, 0x7d, 0x18, 0x5e, 0x30, 0xb5, 0x3a, 0x47, - 0xcd, 0xc8, 0x03, 0x18, 0x2a, 0xcd, 0xa4, 0xce, 0xb5, 0x8a, 0x83, 0x69, 0x30, 0xeb, 0xd3, 0x81, - 0xb5, 0x2f, 0x14, 0x39, 0x82, 0x81, 0x66, 0x6a, 0x95, 0x57, 0x65, 0xdc, 0x9b, 0x06, 0xb3, 0x90, - 0xee, 0x1a, 0x33, 0x2b, 0xc9, 0x63, 0x88, 0x04, 0x93, 0xba, 0xd2, 0x15, 0x6f, 0x8c, 0x37, 0xb4, - 0xde, 0xf1, 0x16, 0xcb, 0x4a, 0x12, 0xc3, 0x80, 0x95, 0xa5, 0x44, 0xa5, 0xe2, 0xfe, 0x34, 0x98, - 0x8d, 0xa8, 0x37, 0xc9, 0x67, 0x30, 0x5a, 0x30, 0xbd, 0x44, 0x69, 0x6e, 0xee, 0xd8, 0x8a, 0x43, - 0x07, 0x64, 0xa5, 0x61, 0xf3, 0xba, 0x45, 0x79, 0x65, 0xd8, 0xec, 0x3a, 0x36, 0xd6, 0xbe, 0x50, - 0xe4, 0x4b, 0xd8, 0x5b, 0xf3, 0x82, 0xad, 0x73, 0x17, 0x50, 0x95, 0xf1, 0xc0, 0x06, 0x44, 0x16, - 0xfd, 0xc9, 0x80, 0x59, 0x69, 0xb2, 0x2b, 0x94, 0x1b, 0x97, 0x7d, 0xe8, 0xb2, 0x3b, 0x20, 0x2b, - 0xc9, 0x17, 0x30, 0xae, 0x85, 0xc8, 0x37, 0x28, 0x55, 0xc5, 0x9b, 0x78, 0x64, 0x69, 0x43, 0x2d, - 0xc4, 0x2b, 0x87, 0x98, 0x80, 0x15, 0x5e, 0x29, 0xc1, 0x0a, 0x34, 0xf7, 0x61, 0x1a, 0xcc, 0x26, - 0x14, 0x3c, 0x94, 0x95, 0xe4, 0x09, 0x1c, 0x16, 0x9c, 0xcb, 0xb2, 0x6a, 0x98, 0xe6, 0x32, 0xf7, - 0x2d, 0x8e, 0x6d, 0x8b, 0xe4, 0x86, 0xeb, 0xb4, 0xeb, 0xf6, 0x5b, 0x88, 0x25, 0x0a, 0x2e, 0x75, - 0x8e, 0xbf, 0x62, 0xd1, 0xda, 0x89, 0xa9, 0xb6, 0xae, 0x99, 0xbc, 0x8a, 0xa3, 0x69, 0x30, 0x1b, - 0xd2, 0xfb, 0xce, 0x7f, 0xe6, 0xdd, 0x2f, 0x9d, 0x97, 0x7c, 0x0d, 0x63, 0x26, 0xaa, 0x2d, 0xd9, - 0xfd, 0x69, 0x30, 0xdb, 0x3b, 0x39, 0x4c, 0xfd, 0x53, 0x9e, 0xce, 0xb3, 0x8e, 0x35, 0x05, 0x26, - 0x2a, 0xdf, 0x41, 0x0a, 0x87, 0x12, 0x15, 0x6f, 0x65, 0x81, 0xf9, 0x42, 0xf2, 0x56, 0xe4, 0x0d, - 0xab, 0x31, 0x3e, 0xb0, 0x04, 0x0f, 0xbc, 0xeb, 0x47, 0xe3, 0x79, 0xc1, 0x6a, 0x4c, 0xf6, 0x61, - 0x2f, 0x53, 0xa7, 0xeb, 0x6a, 0x83, 0x14, 0x5f, 0xb7, 0xa8, 0x74, 0x32, 0x87, 0x4f, 0xb7, 0x88, - 0x12, 0xbc, 0x51, 0x48, 0x3e, 0x87, 0x11, 0xdb, 0xb0, 0x6a, 0xcd, 0x2e, 0xd7, 0x68, 0x45, 0x32, - 0xa4, 0x6f, 0x80, 0xdb, 0x53, 0xed, 0xdd, 0x9e, 0x6a, 0xf2, 0x7b, 0x0f, 0x0e, 0x9f, 0x57, 0x4a, - 0x30, 0x5d, 0x2c, 0x8d, 0xee, 0xba, 0x4a, 0xe4, 0x31, 0xf4, 0x8d, 0x4c, 0x6d, 0xc6, 0xf1, 0xc9, - 0x24, 0x35, 0x62, 0xf7, 0xba, 0xa4, 0xd6, 0x65, 0x94, 0x86, 0x4d, 0xc1, 0x4b, 0x2c, 0x73, 0xb1, - 0x66, 0x2e, 0x79, 0x44, 0xc7, 0x1d, 0x36, 0x5f, 0xb3, 0xc6, 0x28, 0x4d, 0x57, 0x35, 0xf2, 0x56, - 0x77, 0x3a, 0xf4, 0x26, 0xf9, 0x0a, 0x06, 0x12, 0x17, 0x15, 0x6f, 0x8c, 0x06, 0xc3, 0xd9, 0xf8, - 0xe4, 0x28, 0xbd, 0xb9, 0x29, 0xd4, 0xfa, 0xb2, 0xe6, 0x17, 0x4e, 0x7d, 0x1c, 0x79, 0x04, 0xa0, - 0x8a, 0x25, 0xd6, 0xcc, 0xb4, 0x63, 0xd5, 0x19, 0xd2, 0x91, 0x43, 0x5e, 0xa1, 0x24, 0xdf, 0xc3, - 0x44, 0x9b, 0x9e, 0x73, 0x9f, 0x77, 0xd7, 0xe6, 0x7d, 0xf0, 0x56, 0xde, 0x0b, 0x13, 0xe1, 0x92, - 0x2b, 0x1a, 0xe9, 0x1b, 0x56, 0x52, 0xc3, 0xbd, 0xb7, 0x07, 0xd1, 0x0d, 0x78, 0x0a, 0x3b, 0x28, - 0x25, 0x97, 0xdd, 0x28, 0xc0, 0x8e, 0xe2, 0xcc, 0x20, 0xd4, 0x39, 0xc8, 0x53, 0x98, 0x48, 0xd4, - 0xf2, 0x6a, 0x5b, 0xb9, 0x67, 0x2b, 0xef, 0xa5, 0xdd, 0xa2, 0xbb, 0x0a, 0x34, 0xb2, 0x41, 0xbe, - 0xdc, 0xcf, 0x70, 0xf0, 0x8c, 0x35, 0x05, 0xae, 0x3f, 0x72, 0xea, 0x5b, 0x3a, 0xbd, 0x3b, 0xe8, - 0x24, 0xdf, 0x00, 0xb9, 0x99, 0xf9, 0x43, 0xdb, 0x48, 0x24, 0x1c, 0x51, 0x2b, 0x77, 0x73, 0xef, - 0xa5, 0x66, 0xba, 0x55, 0x1f, 0xc1, 0x8b, 0x40, 0xbf, 0x64, 0x9a, 0x75, 0x2a, 0xb0, 0xe7, 0x37, - 0x35, 0xc3, 0xbb, 0x6a, 0x7e, 0x07, 0xf1, 0xbb, 0x35, 0x3f, 0x98, 0xf1, 0x6f, 0x01, 0x3c, 0x3a, - 0x53, 0xe6, 0x15, 0x2b, 0xb5, 0x3c, 0x9f, 0xcf, 0x9f, 0xf1, 0xa6, 0xc1, 0xc2, 0x2c, 0xaa, 0x27, - 0x9e, 0xc2, 0x58, 0x61, 0x53, 0xa2, 0xcc, 0xef, 0xe6, 0x0f, 0x2e, 0xc2, 0x7e, 0x71, 0x4f, 0xcc, - 0x53, 0x16, 0x58, 0x6d, 0xfc, 0x8d, 0xde, 0xfb, 0x6e, 0x44, 0x3e, 0xc6, 0x58, 0xc9, 0x9f, 0x01, - 0x4c, 0xce, 0xe7, 0xf3, 0xe7, 0x4c, 0xb3, 0x39, 0x2b, 0x56, 0xa8, 0xb7, 0xb3, 0x08, 0xde, 0x37, - 0x8b, 0xbb, 0xde, 0x8d, 0xdc, 0x87, 0xdd, 0x62, 0xd9, 0x36, 0x2b, 0x15, 0x87, 0xd3, 0x70, 0x16, - 0xd1, 0xce, 0xb2, 0xba, 0xd7, 0x12, 0x59, 0x9d, 0x57, 0xa5, 0xdb, 0x96, 0x3e, 0x1d, 0x39, 0x24, - 0x2b, 0x95, 0xd9, 0x31, 0xbf, 0xde, 0x6e, 0x27, 0xbc, 0x99, 0xbc, 0x80, 0x1d, 0x5b, 0xc0, 0xf0, - 0x31, 0x3b, 0x69, 0xf9, 0xec, 0x50, 0x7b, 0x26, 0xfb, 0x10, 0xd6, 0x6a, 0x61, 0xd9, 0x8c, 0xa8, - 0x39, 0xde, 0xfe, 0x56, 0x84, 0xb7, 0xbf, 0x15, 0x3f, 0x24, 0x7f, 0x5f, 0x1f, 0x07, 0xff, 0x5c, - 0x1f, 0x07, 0xff, 0x5e, 0x1f, 0x07, 0x7f, 0xfd, 0x77, 0xfc, 0x09, 0xec, 0x73, 0xb9, 0x48, 0x75, - 0xb5, 0xda, 0xa4, 0xab, 0x8d, 0xfd, 0xff, 0xba, 0xdc, 0xb5, 0x3f, 0x4f, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0xff, 0x96, 0xda, 0x95, 0x17, 0x1e, 0x07, 0x00, 0x00, + // 904 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0x67, 0xbd, 0x4e, 0x6c, 0x3f, 0xdb, 0xa9, 0x33, 0xae, 0x9a, 0x6d, 0xa1, 0xc1, 0x5d, 0x38, + 0x98, 0x8b, 0x2b, 0x52, 0x84, 0x38, 0x20, 0xa4, 0xd0, 0x46, 0x68, 0x0f, 0xa9, 0xcc, 0x34, 0xaa, + 0xb8, 0xad, 0x26, 0xbb, 0x0f, 0x7b, 0x65, 0xef, 0xce, 0x74, 0x66, 0xd6, 0x22, 0x67, 0x0e, 0x7c, + 0x03, 0xc4, 0x47, 0xe2, 0xc8, 0x95, 0x1b, 0x0a, 0x5f, 0x04, 0xcd, 0xcc, 0x8e, 0xe3, 0x86, 0x46, + 0x6a, 0x4f, 0x3b, 0xef, 0xf7, 0xde, 0xbc, 0xf7, 0x7b, 0xff, 0x66, 0xa1, 0x57, 0x0a, 0x31, 0x13, + 0x92, 0x6b, 0x4e, 0xc2, 0x52, 0x88, 0x47, 0xf7, 0x17, 0x7c, 0xc1, 0xad, 0xfc, 0xd4, 0x9c, 0x9c, + 0xea, 0xd1, 0x61, 0x66, 0xb0, 0x0c, 0x95, 0xe2, 0xb2, 0x81, 0x06, 0x25, 0x6a, 0x26, 0x2e, 0x1b, + 0x69, 0xb8, 0xda, 0x48, 0x91, 0x79, 0x31, 0xfe, 0xbb, 0x0d, 0xdd, 0x0b, 0xa6, 0x56, 0xe7, 0xa8, + 0x19, 0x79, 0x08, 0x5d, 0xa5, 0x99, 0xd4, 0xa9, 0x56, 0x51, 0x30, 0x09, 0xa6, 0x6d, 0xda, 0xb1, + 0xf2, 0x85, 0x22, 0x47, 0xd0, 0xd1, 0x4c, 0xad, 0xd2, 0x22, 0x8f, 0x5a, 0x93, 0x60, 0x1a, 0xd2, + 0x7d, 0x23, 0x26, 0x39, 0x79, 0x02, 0x03, 0xc1, 0xa4, 0x2e, 0x74, 0xc1, 0x2b, 0xa3, 0x0d, 0xad, + 0xb6, 0xbf, 0xc5, 0x92, 0x9c, 0x44, 0xd0, 0x61, 0x79, 0x2e, 0x51, 0xa9, 0xa8, 0x3d, 0x09, 0xa6, + 0x3d, 0xea, 0x45, 0xf2, 0x31, 0xf4, 0x16, 0x4c, 0x2f, 0x51, 0x9a, 0x9b, 0x7b, 0x36, 0x62, 0xd7, + 0x01, 0x49, 0x6e, 0xd8, 0xbc, 0xa9, 0x51, 0x5e, 0x19, 0x36, 0xfb, 0x8e, 0x8d, 0x95, 0x2f, 0x14, + 0xf9, 0x1c, 0x0e, 0xd6, 0x3c, 0x63, 0xeb, 0xd4, 0x19, 0x14, 0x79, 0xd4, 0xb1, 0x06, 0x03, 0x8b, + 0xfe, 0x68, 0xc0, 0x24, 0x37, 0xde, 0x15, 0xca, 0x8d, 0xf3, 0xde, 0x75, 0xde, 0x1d, 0x90, 0xe4, + 0xe4, 0x53, 0xe8, 0x97, 0x42, 0xa4, 0x1b, 0x94, 0xaa, 0xe0, 0x55, 0xd4, 0xb3, 0xb4, 0xa1, 0x14, + 0xe2, 0xb5, 0x43, 0x8c, 0xc1, 0x0a, 0xaf, 0x94, 0x60, 0x19, 0x9a, 0xfb, 0x30, 0x09, 0xa6, 0x43, + 0x0a, 0x1e, 0x4a, 0x72, 0xf2, 0x14, 0xc6, 0x19, 0xe7, 0x32, 0x2f, 0x2a, 0xa6, 0xb9, 0x4c, 0x7d, + 0x8a, 0x7d, 0x9b, 0x22, 0xd9, 0x51, 0x9d, 0x36, 0xd9, 0x7e, 0x03, 0x91, 0x44, 0xc1, 0xa5, 0x4e, + 0xf1, 0x17, 0xcc, 0x6a, 0x5b, 0x31, 0x55, 0x97, 0x25, 0x93, 0x57, 0xd1, 0x60, 0x12, 0x4c, 0xbb, + 0xf4, 0x81, 0xd3, 0x9f, 0x79, 0xf5, 0x2b, 0xa7, 0x25, 0x5f, 0x41, 0x9f, 0x89, 0x62, 0x4b, 0x76, + 0x34, 0x09, 0xa6, 0x07, 0x27, 0xe3, 0x99, 0x6f, 0xe5, 0xe9, 0x3c, 0x69, 0x58, 0x53, 0x60, 0xa2, + 0xf0, 0x19, 0xcc, 0x60, 0x2c, 0x51, 0xf1, 0x5a, 0x66, 0x98, 0x2e, 0x24, 0xaf, 0x45, 0x5a, 0xb1, + 0x12, 0xa3, 0x43, 0x4b, 0xf0, 0xd0, 0xab, 0x7e, 0x30, 0x9a, 0x97, 0xac, 0x44, 0xf2, 0x19, 0x0c, + 0x33, 0x5e, 0x55, 0x98, 0xf9, 0x5e, 0x12, 0x57, 0xd4, 0x1b, 0x30, 0xc9, 0xc9, 0x17, 0x30, 0xda, + 0x31, 0x62, 0xeb, 0x82, 0xa9, 0x68, 0x6c, 0x3d, 0xde, 0xbb, 0xc1, 0x4f, 0x0d, 0x1c, 0x8f, 0xe0, + 0x20, 0x51, 0xa7, 0xeb, 0x62, 0x83, 0x14, 0xdf, 0xd4, 0xa8, 0x74, 0x3c, 0x87, 0x7b, 0x5b, 0x44, + 0x09, 0x5e, 0x29, 0x24, 0x9f, 0x40, 0x8f, 0x6d, 0x58, 0xb1, 0x66, 0x97, 0x6b, 0xb4, 0x43, 0xd7, + 0xa5, 0x37, 0xc0, 0xed, 0x2e, 0xb5, 0x6e, 0x77, 0x29, 0xfe, 0xad, 0x05, 0xe3, 0x17, 0x85, 0x12, + 0x4c, 0x67, 0x4b, 0x33, 0xc7, 0x4d, 0x24, 0xf2, 0x04, 0xda, 0x66, 0xec, 0xad, 0xc7, 0xfe, 0xc9, + 0x70, 0x66, 0x96, 0xc7, 0xcf, 0x39, 0xb5, 0x2a, 0x33, 0xb9, 0x58, 0x65, 0x3c, 0xc7, 0x3c, 0x15, + 0x6b, 0xe6, 0x9c, 0x0f, 0x68, 0xbf, 0xc1, 0xe6, 0x6b, 0x56, 0x99, 0xc9, 0xd5, 0x45, 0x89, 0xbc, + 0xd6, 0xcd, 0x5c, 0x7b, 0x91, 0x7c, 0x09, 0x1d, 0x89, 0x8b, 0x82, 0x57, 0x66, 0xa6, 0xc3, 0x69, + 0xff, 0xe4, 0x68, 0xb6, 0xbb, 0x79, 0xd4, 0xea, 0x92, 0xea, 0x67, 0x4e, 0xbd, 0x1d, 0x79, 0x0c, + 0xa0, 0xb2, 0x25, 0x96, 0xcc, 0xa4, 0x63, 0xa7, 0x3d, 0xa4, 0x3d, 0x87, 0xbc, 0x46, 0x49, 0xbe, + 0x83, 0xa1, 0x36, 0x39, 0xa7, 0xde, 0xef, 0xbe, 0xf5, 0xfb, 0xf0, 0x2d, 0xbf, 0x17, 0xc6, 0xc2, + 0x39, 0x57, 0x74, 0xa0, 0x77, 0xa4, 0xb8, 0x84, 0xfb, 0x6f, 0x17, 0xa2, 0x29, 0xf0, 0x04, 0xf6, + 0x50, 0x4a, 0x2e, 0x9b, 0x52, 0x80, 0x2d, 0xc5, 0x99, 0x41, 0xa8, 0x53, 0x90, 0x67, 0x30, 0x94, + 0xa8, 0xe5, 0xd5, 0x36, 0x72, 0xcb, 0x46, 0x3e, 0x98, 0x35, 0x0f, 0x87, 0x8b, 0x40, 0x07, 0xd6, + 0xc8, 0x87, 0xfb, 0x09, 0x0e, 0x9f, 0xb3, 0x2a, 0xc3, 0xf5, 0x07, 0x56, 0x7d, 0x4b, 0xa7, 0x75, + 0x07, 0x9d, 0xf8, 0x6b, 0x20, 0xbb, 0x9e, 0xdf, 0x37, 0x8d, 0x58, 0xc2, 0x11, 0xb5, 0xeb, 0x63, + 0xee, 0xbd, 0xd2, 0x4c, 0xd7, 0xea, 0x03, 0x78, 0x11, 0x68, 0xe7, 0x4c, 0xb3, 0x66, 0x0a, 0xec, + 0xf9, 0x26, 0x66, 0x78, 0x57, 0xcc, 0x6f, 0x21, 0xfa, 0x7f, 0xcc, 0xf7, 0x66, 0xfc, 0x6b, 0x00, + 0x8f, 0xcf, 0x94, 0xe9, 0x62, 0xa1, 0x96, 0xe7, 0xf3, 0xf9, 0xf3, 0xed, 0x02, 0x79, 0xe2, 0x33, + 0xe8, 0x2b, 0xac, 0x72, 0x94, 0xe9, 0xdd, 0xfc, 0xc1, 0x59, 0xd8, 0x17, 0xfc, 0xc4, 0xb4, 0x32, + 0xc3, 0x62, 0xe3, 0x6f, 0xb4, 0xde, 0x75, 0x63, 0xe0, 0x6d, 0x8c, 0x14, 0xff, 0x1e, 0xc0, 0xf0, + 0x7c, 0x3e, 0x7f, 0xc1, 0x34, 0x9b, 0xb3, 0x6c, 0x85, 0x7a, 0x5b, 0x8b, 0xe0, 0x5d, 0xb5, 0xb8, + 0xab, 0x6f, 0xe4, 0x01, 0xec, 0x67, 0xcb, 0xba, 0x5a, 0xa9, 0x28, 0x9c, 0x84, 0xd3, 0x01, 0x6d, + 0x24, 0x3b, 0xf7, 0x5a, 0x22, 0x2b, 0xd3, 0x22, 0x77, 0xdb, 0xd2, 0xa6, 0x3d, 0x87, 0x24, 0xb9, + 0x32, 0x3b, 0xe6, 0xd7, 0xdb, 0xed, 0x84, 0x17, 0xe3, 0x97, 0xb0, 0x67, 0x03, 0x18, 0x3e, 0x66, + 0x27, 0x2d, 0x9f, 0x3d, 0x6a, 0xcf, 0x64, 0x04, 0x61, 0xa9, 0x16, 0x96, 0x4d, 0x8f, 0x9a, 0xe3, + 0xed, 0xb7, 0x22, 0xbc, 0xfd, 0x56, 0x7c, 0x1f, 0xff, 0x79, 0x7d, 0x1c, 0xfc, 0x75, 0x7d, 0x1c, + 0xfc, 0x73, 0x7d, 0x1c, 0xfc, 0xf1, 0xef, 0xf1, 0x47, 0x30, 0xe2, 0x72, 0x31, 0xd3, 0xc5, 0x6a, + 0x33, 0x5b, 0x6d, 0xec, 0xff, 0xf0, 0x72, 0xdf, 0x7e, 0x9e, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, + 0x9c, 0x8a, 0xf3, 0x35, 0x6e, 0x07, 0x00, 0x00, } func (m *TaskMeta) Marshal() (dAtA []byte, err error) { @@ -934,6 +952,22 @@ func (m *TaskMeta) 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 = encodeVarintMpp(dAtA, i, uint64(len(m.ConnectionAlias))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + } + if m.ConnectionId != 0 { + i = encodeVarintMpp(dAtA, i, uint64(m.ConnectionId)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x90 + } if len(m.ResourceGroupName) > 0 { i -= len(m.ResourceGroupName) copy(dAtA[i:], m.ResourceGroupName) @@ -1650,6 +1684,13 @@ func (m *TaskMeta) Size() (n int) { if l > 0 { n += 2 + l + sovMpp(uint64(l)) } + if m.ConnectionId != 0 { + n += 2 + sovMpp(uint64(m.ConnectionId)) + } + l = len(m.ConnectionAlias) + if l > 0 { + n += 2 + l + sovMpp(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2241,6 +2282,57 @@ func (m *TaskMeta) Unmarshal(dAtA []byte) error { } m.ResourceGroupName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 18: + 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 ErrIntOverflowMpp + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ConnectionId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 19: + 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 ErrIntOverflowMpp + } + 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 ErrInvalidLengthMpp + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMpp + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConnectionAlias = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipMpp(dAtA[iNdEx:]) diff --git a/proto/mpp.proto b/proto/mpp.proto index e7fa9eaf7..268e218de 100644 --- a/proto/mpp.proto +++ b/proto/mpp.proto @@ -28,6 +28,8 @@ message TaskMeta { bool report_execution_summary = 12; // Only when coordinator_address is not empty, this flag can be true. When set to true, TiFlash only report execution summary through ReportMPPTaskStatus service, don't include summaries in MppDataPacket kvrpcpb.APIVersion api_version = 16; // API version of the request string resource_group_name = 17; + uint64 connection_id = 18; // This is the session id between a client and tidb + string connection_alias = 19; // This is the session alias between a client and tidb } message IsAliveRequest { diff --git a/scripts/proto.lock b/scripts/proto.lock index 0ba45430c..519604fb4 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -12207,6 +12207,16 @@ "id": 17, "name": "resource_group_name", "type": "string" + }, + { + "id": 18, + "name": "connection_id", + "type": "uint64" + }, + { + "id": 19, + "name": "connection_alias", + "type": "string" } ] },