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/kvrpcpb/kvrpcpb.pb.go b/pkg/kvrpcpb/kvrpcpb.pb.go index 289166374..dbb192cd1 100644 --- a/pkg/kvrpcpb/kvrpcpb.pb.go +++ b/pkg/kvrpcpb/kvrpcpb.pb.go @@ -1971,10 +1971,9 @@ type CheckTxnStatusResponse struct { RegionError *errorpb.Error `protobuf:"bytes,1,opt,name=region_error,json=regionError,proto3" json:"region_error,omitempty"` Error *KeyError `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"` // Three kinds of transaction status: - // - // locked: lock_ttl > 0 - // committed: commit_version > 0 - // rollbacked: lock_ttl = 0 && commit_version = 0 + // locked: lock_ttl > 0 + // committed: commit_version > 0 + // rollbacked: lock_ttl = 0 && commit_version = 0 LockTtl uint64 `protobuf:"varint,3,opt,name=lock_ttl,json=lockTtl,proto3" json:"lock_ttl,omitempty"` CommitVersion uint64 `protobuf:"varint,4,opt,name=commit_version,json=commitVersion,proto3" json:"commit_version,omitempty"` // The action performed by TiKV (and why if the action is to rollback). @@ -9691,7 +9690,6 @@ func (m *RawChecksumResponse) GetTotalBytes() uint64 { type CompactError struct { // Types that are valid to be assigned to Error: - // // *CompactError_ErrInvalidStartKey // *CompactError_ErrPhysicalTableNotExist // *CompactError_ErrCompactInProgress diff --git a/pkg/mpp/mpp.pb.go b/pkg/mpp/mpp.pb.go index cccb22c80..2b8bcbac1 100644 --- a/pkg/mpp/mpp.pb.go +++ b/pkg/mpp/mpp.pb.go @@ -42,6 +42,7 @@ type TaskMeta struct { CoordinatorAddress string `protobuf:"bytes,11,opt,name=coordinator_address,json=coordinatorAddress,proto3" json:"coordinator_address,omitempty"` 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"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -171,6 +172,13 @@ func (m *TaskMeta) GetApiVersion() kvrpcpb.APIVersion { return kvrpcpb.APIVersion_V1 } +func (m *TaskMeta) GetResourceGroupName() string { + if m != nil { + return m.ResourceGroupName + } + return "" +} + type IsAliveRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -844,60 +852,62 @@ func init() { func init() { proto.RegisterFile("mpp.proto", fileDescriptor_819623c7fa76fc55) } var fileDescriptor_819623c7fa76fc55 = []byte{ - // 846 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcd, 0x6e, 0x1b, 0x37, - 0x10, 0xee, 0x6a, 0x65, 0xfd, 0x8c, 0x56, 0xae, 0x43, 0x07, 0xf1, 0x26, 0x6d, 0x5c, 0x65, 0xd1, - 0x83, 0x4e, 0x0a, 0xea, 0x14, 0x45, 0x0f, 0x45, 0x01, 0x37, 0xf1, 0x61, 0x0f, 0x2e, 0x54, 0xc6, - 0x08, 0x7a, 0x5b, 0xd0, 0xcb, 0xa9, 0x44, 0x48, 0xbb, 0x64, 0x48, 0x4a, 0xa8, 0xcf, 0x3d, 0xf4, - 0x0d, 0x8a, 0x3e, 0x52, 0x8f, 0xbd, 0xf6, 0x56, 0xb8, 0x2f, 0x52, 0x90, 0xdc, 0x55, 0x1c, 0x27, - 0x06, 0x92, 0x93, 0x38, 0xdf, 0x0c, 0x67, 0xbe, 0x19, 0x7e, 0xb3, 0x82, 0x61, 0xa5, 0xd4, 0x4c, - 0x69, 0x69, 0x25, 0x89, 0x2b, 0xa5, 0x1e, 0xdd, 0x5f, 0xc8, 0x85, 0xf4, 0xf6, 0x53, 0x77, 0x0a, - 0xae, 0x47, 0xf7, 0x4a, 0x87, 0x95, 0x68, 0x8c, 0xd4, 0x0d, 0x94, 0x54, 0x68, 0x99, 0xba, 0x6c, - 0xac, 0xf1, 0x6a, 0xab, 0x55, 0xd9, 0x9a, 0xd9, 0x3f, 0x31, 0x0c, 0x2e, 0x98, 0x59, 0x9d, 0xa3, - 0x65, 0xe4, 0x21, 0x0c, 0x8c, 0x65, 0xda, 0x16, 0xd6, 0xa4, 0xd1, 0x24, 0x9a, 0x76, 0x69, 0xdf, - 0xdb, 0x17, 0x86, 0x1c, 0x41, 0xdf, 0x32, 0xb3, 0x2a, 0x04, 0x4f, 0x3b, 0x93, 0x68, 0x1a, 0xd3, - 0x9e, 0x33, 0x73, 0x4e, 0x9e, 0x40, 0xa2, 0x98, 0xb6, 0xc2, 0x0a, 0x59, 0x3b, 0x6f, 0xec, 0xbd, - 0xa3, 0x1d, 0x96, 0x73, 0x92, 0x42, 0x9f, 0x71, 0xae, 0xd1, 0x98, 0xb4, 0x3b, 0x89, 0xa6, 0x43, - 0xda, 0x9a, 0xe4, 0x33, 0x18, 0x2e, 0x98, 0x5d, 0xa2, 0x76, 0x37, 0xf7, 0x7c, 0xc5, 0x41, 0x00, - 0x72, 0xee, 0xd8, 0xbc, 0xde, 0xa0, 0xbe, 0x72, 0x6c, 0x7a, 0x81, 0x8d, 0xb7, 0x2f, 0x0c, 0xf9, - 0x12, 0xf6, 0xd7, 0xb2, 0x64, 0xeb, 0x22, 0x04, 0x08, 0x9e, 0xf6, 0x7d, 0x40, 0xe2, 0xd1, 0x9f, - 0x1c, 0x98, 0x73, 0x97, 0xdd, 0xa0, 0xde, 0x86, 0xec, 0x83, 0x90, 0x3d, 0x00, 0x39, 0x27, 0x5f, - 0xc0, 0xa8, 0x52, 0xaa, 0xd8, 0xa2, 0x36, 0x42, 0xd6, 0xe9, 0xd0, 0xd3, 0x86, 0x4a, 0xa9, 0x57, - 0x01, 0x71, 0x01, 0x2b, 0xbc, 0x32, 0x8a, 0x95, 0xe8, 0xee, 0xc3, 0x24, 0x9a, 0x8e, 0x29, 0xb4, - 0x50, 0xce, 0xc9, 0x53, 0x38, 0x2c, 0xa5, 0xd4, 0x5c, 0xd4, 0xcc, 0x4a, 0x5d, 0xb4, 0x2d, 0x8e, - 0x7c, 0x8b, 0xe4, 0x86, 0xeb, 0xb4, 0xe9, 0xf6, 0x5b, 0x48, 0x35, 0x2a, 0xa9, 0x6d, 0x81, 0xbf, - 0x62, 0xb9, 0xf1, 0x13, 0x33, 0x9b, 0xaa, 0x62, 0xfa, 0x2a, 0x4d, 0x26, 0xd1, 0x74, 0x40, 0x1f, - 0x04, 0xff, 0x59, 0xeb, 0x7e, 0x19, 0xbc, 0xe4, 0x6b, 0x18, 0x31, 0x25, 0x76, 0x64, 0x0f, 0x26, - 0xd1, 0x74, 0xff, 0xe4, 0x70, 0xd6, 0x3e, 0xe5, 0xe9, 0x3c, 0x6f, 0x58, 0x53, 0x60, 0x4a, 0x34, - 0xe7, 0xec, 0x00, 0xf6, 0x73, 0x73, 0xba, 0x16, 0x5b, 0xa4, 0xf8, 0x7a, 0x83, 0xc6, 0x66, 0x73, - 0xf8, 0x74, 0x87, 0x18, 0x25, 0x6b, 0x83, 0xe4, 0x73, 0x18, 0xb2, 0x2d, 0x13, 0x6b, 0x76, 0xb9, - 0x46, 0xff, 0xe8, 0x03, 0xfa, 0x06, 0xb8, 0x3d, 0xa5, 0xce, 0xed, 0x29, 0x65, 0xbf, 0x77, 0xe0, - 0xf0, 0x85, 0x30, 0x8a, 0xd9, 0x72, 0xe9, 0x74, 0xd4, 0x54, 0x22, 0x4f, 0xa0, 0xeb, 0x64, 0xe7, - 0x33, 0x8e, 0x4e, 0xc6, 0x33, 0x27, 0xde, 0x56, 0x67, 0xd4, 0xbb, 0x9c, 0x72, 0xb0, 0x2e, 0x25, - 0x47, 0x5e, 0xa8, 0x35, 0x0b, 0xc9, 0x13, 0x3a, 0x6a, 0xb0, 0xf9, 0x9a, 0xd5, 0x4e, 0x39, 0x56, - 0x54, 0x28, 0x37, 0xb6, 0xd1, 0x55, 0x6b, 0x92, 0xaf, 0xa0, 0xaf, 0x71, 0x21, 0x64, 0xed, 0x34, - 0x15, 0x4f, 0x47, 0x27, 0x47, 0xb3, 0x9b, 0xca, 0xa7, 0xde, 0x97, 0xd7, 0xbf, 0x48, 0xda, 0xc6, - 0x91, 0xc7, 0x00, 0xa6, 0x5c, 0x62, 0xc5, 0x5c, 0x3b, 0x5e, 0x6d, 0x31, 0x1d, 0x06, 0xe4, 0x15, - 0x6a, 0xf2, 0x3d, 0x8c, 0xad, 0xeb, 0xb9, 0x68, 0xf3, 0xf6, 0x7c, 0xde, 0x87, 0x6f, 0xe5, 0xbd, - 0x70, 0x11, 0x21, 0xb9, 0xa1, 0x89, 0xbd, 0x61, 0x65, 0x15, 0xdc, 0x7f, 0x7b, 0x10, 0xcd, 0x80, - 0x27, 0xb0, 0x87, 0x5a, 0x4b, 0xdd, 0x8c, 0x02, 0xfc, 0x28, 0xce, 0x1c, 0x42, 0x83, 0x83, 0x3c, - 0x83, 0xb1, 0x46, 0xab, 0xaf, 0x76, 0x95, 0x3b, 0xbe, 0xf2, 0xfe, 0xac, 0x59, 0xdc, 0x50, 0x81, - 0x26, 0x3e, 0xa8, 0x2d, 0xf7, 0x33, 0xdc, 0x7b, 0xce, 0xea, 0x12, 0xd7, 0x1f, 0x39, 0xf5, 0x1d, - 0x9d, 0xce, 0x1d, 0x74, 0xb2, 0x6f, 0x80, 0xdc, 0xcc, 0xfc, 0xa1, 0x6d, 0x64, 0x1a, 0x8e, 0xa8, - 0x97, 0xaf, 0xbb, 0xf7, 0xd2, 0x32, 0xbb, 0x31, 0x1f, 0xc1, 0x8b, 0x40, 0x97, 0x33, 0xcb, 0x1a, - 0x15, 0xf8, 0xf3, 0x9b, 0x9a, 0xf1, 0x5d, 0x35, 0xbf, 0x83, 0xf4, 0xdd, 0x9a, 0x1f, 0xcc, 0xf8, - 0xb7, 0x08, 0x1e, 0x9f, 0x19, 0xf7, 0x8a, 0xc2, 0x2c, 0xcf, 0xe7, 0xf3, 0xe7, 0xb2, 0xae, 0xb1, - 0x74, 0x8b, 0xd7, 0x12, 0x9f, 0xc1, 0xc8, 0x60, 0xcd, 0x51, 0x17, 0x77, 0xf3, 0x87, 0x10, 0xe1, - 0xbf, 0xa0, 0x27, 0xee, 0x29, 0x4b, 0x14, 0xdb, 0xf6, 0x46, 0xe7, 0x7d, 0x37, 0x92, 0x36, 0xc6, - 0x59, 0xd9, 0x1f, 0x11, 0x8c, 0xcf, 0xe7, 0xf3, 0x17, 0xcc, 0xb2, 0x39, 0x2b, 0x57, 0x68, 0x77, - 0xb3, 0x88, 0xde, 0x37, 0x8b, 0xbb, 0xde, 0x8d, 0x3c, 0x80, 0x5e, 0xb9, 0xdc, 0xd4, 0x2b, 0x93, - 0xc6, 0x93, 0x78, 0x9a, 0xd0, 0xc6, 0xf2, 0xba, 0xb7, 0x1a, 0x59, 0x55, 0x08, 0x1e, 0xb6, 0xa5, - 0x4b, 0x87, 0x01, 0xc9, 0xb9, 0x71, 0x3b, 0xd6, 0xae, 0x77, 0xd8, 0x89, 0xd6, 0xcc, 0x7e, 0x84, - 0x3d, 0x5f, 0xc0, 0xf1, 0x71, 0x3b, 0xe9, 0xf9, 0xec, 0x51, 0x7f, 0x26, 0x07, 0x10, 0x57, 0x66, - 0xe1, 0xd9, 0x0c, 0xa9, 0x3b, 0xde, 0xfe, 0x56, 0xc4, 0xb7, 0xbf, 0x15, 0x3f, 0x64, 0x7f, 0x5d, - 0x1f, 0x47, 0x7f, 0x5f, 0x1f, 0x47, 0xff, 0x5e, 0x1f, 0x47, 0x7f, 0xfe, 0x77, 0xfc, 0x09, 0x1c, - 0x48, 0xbd, 0x98, 0x59, 0xb1, 0xda, 0xce, 0x56, 0x5b, 0xff, 0x7f, 0x74, 0xd9, 0xf3, 0x3f, 0xcf, - 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x32, 0x76, 0x1d, 0x85, 0xee, 0x06, 0x00, 0x00, + // 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, } func (m *TaskMeta) Marshal() (dAtA []byte, err error) { @@ -924,6 +934,15 @@ func (m *TaskMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ResourceGroupName) > 0 { + i -= len(m.ResourceGroupName) + copy(dAtA[i:], m.ResourceGroupName) + i = encodeVarintMpp(dAtA, i, uint64(len(m.ResourceGroupName))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } if m.ApiVersion != 0 { i = encodeVarintMpp(dAtA, i, uint64(m.ApiVersion)) i-- @@ -1627,6 +1646,10 @@ func (m *TaskMeta) Size() (n int) { if m.ApiVersion != 0 { n += 2 + sovMpp(uint64(m.ApiVersion)) } + l = len(m.ResourceGroupName) + if l > 0 { + n += 2 + l + sovMpp(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2186,6 +2209,38 @@ func (m *TaskMeta) Unmarshal(dAtA []byte) error { break } } + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ResourceGroupName", 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.ResourceGroupName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipMpp(dAtA[iNdEx:]) diff --git a/pkg/resource_manager/resource_manager.pb.go b/pkg/resource_manager/resource_manager.pb.go index c6690ed43..6d8f4236d 100644 --- a/pkg/resource_manager/resource_manager.pb.go +++ b/pkg/resource_manager/resource_manager.pb.go @@ -642,6 +642,7 @@ type TokenBucketRequest struct { ConsumptionSinceLastRequest *Consumption `protobuf:"bytes,4,opt,name=consumption_since_last_request,json=consumptionSinceLastRequest,proto3" json:"consumption_since_last_request,omitempty"` // label background request. IsBackground bool `protobuf:"varint,5,opt,name=is_background,json=isBackground,proto3" json:"is_background,omitempty"` + IsTiflash bool `protobuf:"varint,6,opt,name=is_tiflash,json=isTiflash,proto3" json:"is_tiflash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -738,6 +739,13 @@ func (m *TokenBucketRequest) GetIsBackground() bool { return false } +func (m *TokenBucketRequest) GetIsTiflash() bool { + if m != nil { + return m.IsTiflash + } + return false +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*TokenBucketRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1928,113 +1936,114 @@ func init() { func init() { proto.RegisterFile("resource_manager.proto", fileDescriptor_7048dd9233ee965d) } var fileDescriptor_7048dd9233ee965d = []byte{ - // 1685 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0xdb, 0x46, - 0x16, 0x17, 0xf5, 0xad, 0x27, 0xdb, 0x92, 0xc7, 0x76, 0xac, 0xc8, 0x88, 0x93, 0x70, 0x77, 0x03, - 0xc7, 0xd9, 0xd8, 0x89, 0x77, 0x93, 0x2c, 0xb0, 0xc0, 0x22, 0xb6, 0x9c, 0x4d, 0xbc, 0xb1, 0x13, - 0x63, 0x1c, 0x21, 0xa7, 0x0d, 0x77, 0x44, 0x4d, 0xb4, 0x8c, 0x28, 0x52, 0x1e, 0x92, 0x96, 0x75, - 0x2b, 0xd0, 0x9e, 0xfa, 0x17, 0xf4, 0x4f, 0x28, 0x7a, 0x2a, 0xd0, 0x5b, 0x8b, 0x9e, 0xda, 0x43, - 0x7b, 0xeb, 0xb1, 0xc7, 0x22, 0xfd, 0x47, 0x8a, 0xf9, 0x20, 0x45, 0x59, 0x92, 0xbf, 0x10, 0xb4, - 0x37, 0xce, 0xfb, 0xf8, 0xbd, 0x8f, 0x79, 0xef, 0xcd, 0x70, 0xe0, 0x0a, 0xa3, 0x9e, 0x1b, 0x30, - 0x93, 0x1a, 0x1d, 0xe2, 0x90, 0x16, 0x65, 0x6b, 0x5d, 0xe6, 0xfa, 0x2e, 0x2a, 0x9f, 0xa4, 0x57, - 0xe7, 0x5b, 0x6e, 0xcb, 0x15, 0xcc, 0x75, 0xfe, 0x25, 0xe5, 0xaa, 0x25, 0x16, 0x78, 0xbe, 0xf8, - 0x94, 0x04, 0x7d, 0x09, 0xae, 0xee, 0x5a, 0x9e, 0x8f, 0x95, 0xfa, 0x53, 0xe6, 0x06, 0x5d, 0x0f, - 0xd3, 0xc3, 0x80, 0x7a, 0xbe, 0xfe, 0x89, 0x06, 0xd5, 0x71, 0x5c, 0xaf, 0xeb, 0x3a, 0x1e, 0x45, - 0x77, 0x21, 0x43, 0x19, 0x73, 0x59, 0x45, 0xbb, 0xa1, 0xad, 0x14, 0x37, 0x16, 0xd7, 0x46, 0x9c, - 0x7b, 0xc2, 0xd9, 0x58, 0x4a, 0xa1, 0x47, 0x90, 0x6d, 0x09, 0x80, 0x4a, 0xf2, 0x46, 0x6a, 0xa5, - 0xb8, 0x71, 0x7d, 0x54, 0x7e, 0xc8, 0x10, 0x56, 0xe2, 0xfa, 0x0e, 0x2c, 0x3e, 0xa5, 0xc3, 0x4e, - 0x28, 0x0f, 0xd1, 0x1a, 0xcc, 0x45, 0x20, 0x42, 0xda, 0x70, 0x48, 0x87, 0x0a, 0x87, 0x0a, 0x78, - 0x96, 0xc5, 0x55, 0x5e, 0x90, 0x0e, 0xd5, 0x3f, 0xd2, 0xa0, 0x32, 0x8a, 0x75, 0xb9, 0x78, 0x1e, - 0x40, 0x46, 0x98, 0xac, 0x24, 0x85, 0xf8, 0x99, 0xe1, 0x48, 0x69, 0x7d, 0x17, 0xaa, 0xdb, 0xd4, - 0xa6, 0x3e, 0xfd, 0x20, 0x01, 0xfd, 0x0f, 0x96, 0xc6, 0xa2, 0x5d, 0x2e, 0x24, 0x04, 0xe9, 0x86, - 0xdb, 0xec, 0x8b, 0x88, 0x0a, 0x58, 0x7c, 0xeb, 0xfb, 0xb0, 0xb8, 0x1f, 0x8c, 0xcf, 0x7e, 0x94, - 0x01, 0xed, 0x42, 0x19, 0xf8, 0x2f, 0x54, 0x46, 0x11, 0x3f, 0x9c, 0xc3, 0x5f, 0x6b, 0x30, 0xf7, - 0xca, 0x6d, 0x53, 0x67, 0x2b, 0x30, 0xdb, 0xd4, 0x0f, 0xab, 0x19, 0x3d, 0x86, 0x3c, 0x93, 0x9f, - 0x5e, 0x45, 0x13, 0x15, 0xf8, 0xe7, 0x51, 0xf4, 0x98, 0xa2, 0xd2, 0xc3, 0x91, 0x16, 0x7a, 0x04, - 0x15, 0x9f, 0xb0, 0x16, 0xf5, 0x0d, 0x45, 0x32, 0xba, 0x94, 0x59, 0x6e, 0xd3, 0xe8, 0x78, 0xc2, - 0x83, 0x34, 0x5e, 0x90, 0x7c, 0xa5, 0xba, 0x2f, 0xb8, 0x7b, 0x1e, 0x5a, 0x81, 0xb2, 0x69, 0x5b, - 0xd4, 0xf1, 0x8d, 0xc0, 0xb1, 0x0e, 0x03, 0x6a, 0x58, 0xcd, 0x4a, 0x4a, 0x28, 0xcc, 0x48, 0x7a, - 0x5d, 0x90, 0x77, 0x9a, 0xfa, 0x8f, 0x69, 0x40, 0xa3, 0x3e, 0x5c, 0xb4, 0x2c, 0xd0, 0x73, 0xc8, - 0xb3, 0xc0, 0xb0, 0x7c, 0xaa, 0x3c, 0x2b, 0x6e, 0xac, 0x9d, 0x27, 0xd6, 0xb5, 0x30, 0xe6, 0xfa, - 0xb3, 0x04, 0xce, 0xb1, 0x60, 0x87, 0x03, 0xa0, 0x16, 0x20, 0x46, 0x7a, 0x46, 0xa4, 0x2f, 0x61, - 0x53, 0x02, 0xf6, 0xd1, 0x85, 0x60, 0x49, 0x2f, 0xdc, 0xf5, 0x67, 0x09, 0x5c, 0x66, 0x83, 0xa5, - 0x34, 0xd4, 0x80, 0x65, 0xd3, 0x75, 0xbc, 0xa0, 0xd3, 0xf5, 0x2d, 0xd7, 0x31, 0x3c, 0xcb, 0x31, - 0xa9, 0x61, 0x13, 0x2f, 0xca, 0x77, 0x25, 0x2d, 0x8c, 0x5e, 0x1b, 0x35, 0x5a, 0x1b, 0xe8, 0xe1, - 0xa5, 0x18, 0xc8, 0x01, 0xc7, 0xd8, 0x25, 0x5e, 0x94, 0xc9, 0x3f, 0xc1, 0xb4, 0xe5, 0x19, 0x0d, - 0x62, 0xb6, 0x79, 0x1e, 0x9d, 0x66, 0x25, 0x73, 0x43, 0x5b, 0xc9, 0xe3, 0x29, 0xcb, 0xdb, 0x8a, - 0x68, 0xd5, 0x17, 0x50, 0x88, 0x32, 0x81, 0x36, 0xa1, 0x18, 0x6e, 0x37, 0x33, 0x02, 0x55, 0x3a, - 0x37, 0xc7, 0xd5, 0xba, 0x10, 0xaa, 0x3b, 0x96, 0xcf, 0xc3, 0xc1, 0x05, 0x16, 0x42, 0x54, 0x2d, - 0x40, 0xa3, 0x29, 0x40, 0x07, 0x30, 0x1f, 0x01, 0xc7, 0xf2, 0x7b, 0x8a, 0x85, 0xe1, 0x84, 0x61, - 0xc4, 0x46, 0x40, 0xb7, 0x0a, 0x90, 0x53, 0x54, 0xfd, 0x53, 0x0d, 0xe6, 0x87, 0x1b, 0xe1, 0x72, - 0x4d, 0x56, 0x83, 0x02, 0x53, 0xaa, 0xe1, 0xec, 0xfe, 0xcb, 0x19, 0xdb, 0x2e, 0xa5, 0xf1, 0x40, - 0x4f, 0xff, 0x38, 0x39, 0xd4, 0x95, 0x91, 0x2f, 0x17, 0xad, 0xec, 0x03, 0x40, 0x2d, 0x46, 0x1c, - 0x9f, 0x36, 0xf9, 0x6e, 0x18, 0x3e, 0x87, 0x0c, 0xbd, 0xba, 0x35, 0xea, 0xd5, 0x53, 0x29, 0x8b, - 0xeb, 0x71, 0xdb, 0xa5, 0xd6, 0x10, 0x95, 0x57, 0xf8, 0x62, 0x04, 0x1a, 0x22, 0x28, 0xe4, 0x94, - 0x40, 0x5e, 0x9f, 0x8c, 0x3c, 0xc8, 0x7d, 0xdc, 0xc4, 0x42, 0x68, 0x22, 0xce, 0xf3, 0xf4, 0x6f, - 0x34, 0x98, 0x1f, 0xe7, 0x12, 0x7a, 0x00, 0x69, 0xbf, 0xdf, 0x95, 0x71, 0xcf, 0x9c, 0x51, 0x5d, - 0xaf, 0xfa, 0x5d, 0x8a, 0x85, 0x38, 0xda, 0x86, 0x99, 0xd0, 0xf1, 0x28, 0x13, 0x13, 0x3a, 0x24, - 0xee, 0xdd, 0xb4, 0x52, 0x52, 0xe1, 0xdf, 0x82, 0x92, 0xcf, 0x2c, 0xb3, 0x6d, 0x53, 0xc3, 0xb7, - 0x3a, 0xd4, 0x50, 0xdd, 0x9d, 0xc2, 0xd3, 0x8a, 0xfc, 0xca, 0xea, 0xd0, 0x3d, 0x4f, 0xff, 0x5e, - 0x83, 0x6b, 0xa7, 0x86, 0x7d, 0x8e, 0x30, 0x62, 0x7a, 0x7f, 0x54, 0x18, 0x5f, 0x24, 0xa1, 0x18, - 0x9b, 0x17, 0x08, 0x41, 0x86, 0xa9, 0xd6, 0xd6, 0x56, 0x34, 0x9c, 0x62, 0xb8, 0xce, 0x69, 0x3d, - 0x41, 0x4b, 0x4a, 0x5a, 0x0f, 0xd7, 0xd1, 0x35, 0x00, 0x46, 0x49, 0xd3, 0x68, 0xf4, 0x7d, 0x2a, - 0xa1, 0x35, 0x5e, 0xe1, 0xa4, 0xb9, 0xc5, 0x09, 0xe8, 0x3a, 0x14, 0x7b, 0xcc, 0xf2, 0xa9, 0xe2, - 0xa7, 0x05, 0x1f, 0x04, 0x49, 0x0a, 0xdc, 0x86, 0x59, 0xdf, 0xf5, 0x89, 0x6d, 0x98, 0xdd, 0x20, - 0xf2, 0x30, 0x23, 0xc4, 0x66, 0x04, 0xa3, 0xd6, 0x0d, 0xa4, 0x8b, 0xe8, 0x1e, 0x2c, 0x78, 0x87, - 0xb6, 0x61, 0x93, 0x3e, 0x65, 0x43, 0xe2, 0x59, 0x21, 0x3e, 0xeb, 0x1d, 0xda, 0xbb, 0x9c, 0x37, - 0xd0, 0xb8, 0x0d, 0xb3, 0xed, 0x23, 0x43, 0xf8, 0xc7, 0xba, 0xa6, 0x61, 0xba, 0x81, 0xe3, 0x57, - 0x72, 0x12, 0xbc, 0x7d, 0x84, 0x29, 0x69, 0xe2, 0xae, 0x59, 0xe3, 0x54, 0x74, 0x07, 0x50, 0xfb, - 0xc8, 0x90, 0xbe, 0x0e, 0x64, 0xf3, 0x42, 0xb6, 0xd4, 0x3e, 0x7a, 0xcd, 0x19, 0xa1, 0xb0, 0xfe, - 0x06, 0x4a, 0x27, 0x06, 0xdb, 0x65, 0x6b, 0x75, 0x1e, 0x32, 0x47, 0xc4, 0x0e, 0xa8, 0x4a, 0xa9, - 0x5c, 0x08, 0xfc, 0xe1, 0xb1, 0x76, 0xd9, 0x22, 0x1a, 0x8f, 0xff, 0x5d, 0x0a, 0xa6, 0x87, 0xae, - 0x1a, 0xfc, 0xce, 0x10, 0x1b, 0x31, 0xe2, 0x1b, 0xad, 0x43, 0xba, 0xe3, 0x36, 0xa5, 0xea, 0xcc, - 0xc6, 0xd2, 0xb8, 0x6e, 0x77, 0x83, 0xee, 0x9e, 0xdb, 0xa4, 0x58, 0x08, 0xa2, 0x5d, 0x98, 0xe2, - 0xe3, 0xc7, 0xa3, 0xbe, 0x6f, 0x39, 0xad, 0xf0, 0x34, 0x5c, 0x9d, 0xa0, 0x18, 0x4b, 0xc8, 0x81, - 0xd2, 0xc0, 0xc0, 0xea, 0xe1, 0x37, 0x7a, 0x03, 0x0b, 0x43, 0x27, 0x6c, 0x04, 0x9b, 0x3e, 0x1d, - 0x76, 0x90, 0x87, 0x08, 0x76, 0x8e, 0x8d, 0x12, 0x51, 0x15, 0xf2, 0x5d, 0x66, 0xb9, 0xcc, 0xf2, - 0xfb, 0xa2, 0xe0, 0xa6, 0x71, 0xb4, 0x46, 0xbb, 0x50, 0x66, 0x81, 0x43, 0x7a, 0xa4, 0x3f, 0x30, - 0x9b, 0x15, 0x66, 0xc7, 0x65, 0x5e, 0x4a, 0x46, 0xd6, 0x4a, 0x6c, 0x98, 0x80, 0xea, 0x30, 0x37, - 0x38, 0x5b, 0x07, 0x80, 0x39, 0x01, 0x38, 0xe6, 0xbe, 0x35, 0x38, 0x74, 0x23, 0x4c, 0xd4, 0x18, - 0xa1, 0xe9, 0xff, 0x81, 0xca, 0xa4, 0x44, 0xa2, 0x35, 0x48, 0x85, 0xcd, 0x7b, 0xe6, 0xc4, 0x48, - 0xb2, 0xba, 0xfe, 0xad, 0x16, 0x82, 0x8d, 0xc9, 0xd4, 0x3a, 0xa4, 0xcc, 0xee, 0x39, 0xc1, 0xb8, - 0x24, 0x7a, 0x08, 0x39, 0xcb, 0x15, 0x7d, 0x77, 0xbe, 0x99, 0x95, 0xb5, 0x5c, 0xde, 0x8c, 0xe8, - 0x1f, 0x90, 0xb7, 0x5c, 0xd9, 0x84, 0xaa, 0x78, 0xce, 0x50, 0xcc, 0x59, 0xae, 0xe8, 0x4c, 0xbd, - 0x05, 0xc5, 0xf8, 0xc8, 0x7d, 0x0c, 0xf9, 0x28, 0xcd, 0xda, 0xa4, 0x34, 0x0b, 0x85, 0x5d, 0xab, - 0x13, 0xab, 0xbf, 0x48, 0x0b, 0x5d, 0x81, 0x6c, 0x6c, 0xea, 0x6a, 0x58, 0xad, 0xf4, 0x43, 0x75, - 0x15, 0x1d, 0xd2, 0x43, 0x4b, 0x50, 0x78, 0x6b, 0xd9, 0xb6, 0xc1, 0x88, 0x2f, 0x7b, 0x28, 0x8d, - 0xf3, 0x9c, 0x80, 0x89, 0x4f, 0xf9, 0x0c, 0x6c, 0x04, 0xcc, 0xf3, 0x0d, 0x9b, 0xeb, 0x08, 0xbc, - 0x14, 0x06, 0x41, 0x12, 0x28, 0x7c, 0x86, 0x76, 0xc8, 0xf1, 0xe0, 0x70, 0x15, 0x33, 0xb4, 0x43, - 0x8e, 0xd5, 0xf9, 0x78, 0x13, 0x32, 0xe2, 0xea, 0x81, 0x2a, 0x90, 0xeb, 0x50, 0xcf, 0x23, 0xad, - 0xb0, 0x4f, 0xc3, 0xa5, 0xfe, 0x2f, 0x28, 0xaa, 0x2a, 0xc4, 0x81, 0xcd, 0x3b, 0x77, 0x9e, 0x1e, - 0x53, 0xd3, 0xa0, 0x36, 0xe9, 0x7a, 0xfc, 0xfc, 0x50, 0x83, 0x52, 0x7a, 0x36, 0xcb, 0x79, 0x4f, - 0x24, 0x4b, 0x4d, 0xff, 0x23, 0x98, 0x52, 0xfa, 0xaf, 0x89, 0x6f, 0xfe, 0x9f, 0x5f, 0x40, 0xf8, - 0x15, 0xd3, 0x72, 0x5a, 0x46, 0x33, 0x60, 0x44, 0xdc, 0x3c, 0x95, 0x7e, 0x0a, 0xcf, 0x2a, 0xd6, - 0xb6, 0xe2, 0xec, 0x79, 0xe8, 0xa1, 0x9a, 0x4e, 0x72, 0x54, 0xe8, 0x13, 0x7b, 0x44, 0xa0, 0x0f, - 0xc6, 0x93, 0xfe, 0x95, 0x06, 0xa5, 0x13, 0xed, 0x83, 0xee, 0x43, 0x9a, 0x05, 0x36, 0x9d, 0x5c, - 0x6e, 0xb1, 0x48, 0xb1, 0x10, 0xe5, 0x7f, 0xd1, 0xc4, 0xe4, 0xae, 0x28, 0x07, 0xae, 0x4f, 0x54, - 0xda, 0x14, 0x62, 0x58, 0x89, 0xa3, 0xbf, 0x43, 0xa6, 0xc7, 0x5d, 0x52, 0xd5, 0xb6, 0x7c, 0xba, - 0xe3, 0x58, 0x0a, 0xeb, 0xf7, 0x01, 0x8d, 0xb6, 0x28, 0xaf, 0x81, 0x77, 0x6e, 0xc3, 0xe0, 0x71, - 0xc9, 0x7f, 0xa9, 0x02, 0xce, 0xbf, 0x73, 0x1b, 0x3c, 0x5a, 0x6f, 0xf5, 0xea, 0xd0, 0x89, 0xc1, - 0x69, 0x28, 0x0b, 0x49, 0x5c, 0x2f, 0x27, 0x56, 0xff, 0x39, 0x34, 0xec, 0x05, 0x2b, 0x07, 0xa9, - 0xda, 0x7e, 0xbd, 0x9c, 0x40, 0x33, 0x00, 0x3b, 0x2f, 0x79, 0x6b, 0xfc, 0xdb, 0x76, 0x7b, 0x65, - 0x0d, 0x95, 0xa0, 0xb8, 0xf3, 0x52, 0x54, 0xbc, 0x20, 0x24, 0x57, 0xef, 0x43, 0x21, 0x9a, 0xc2, - 0xa8, 0x08, 0xb9, 0xba, 0xd3, 0x76, 0xdc, 0x9e, 0x53, 0x4e, 0x20, 0x80, 0x2c, 0xae, 0x73, 0x72, - 0x59, 0xe3, 0x0c, 0x4c, 0x7a, 0x62, 0x91, 0x5c, 0xad, 0xc1, 0xf4, 0x50, 0x32, 0xb8, 0x91, 0x17, - 0xae, 0x43, 0xe5, 0x4a, 0x6a, 0x6e, 0xb3, 0x3e, 0x0e, 0x9c, 0xb2, 0x86, 0xa6, 0x20, 0x5f, 0x73, - 0x5d, 0x7b, 0x9b, 0x63, 0x26, 0x51, 0x1e, 0xd2, 0xcf, 0x2d, 0xdb, 0x2e, 0xa7, 0x56, 0x6b, 0x50, - 0x3e, 0xb9, 0xa5, 0x68, 0x1a, 0x0a, 0x1c, 0x47, 0x10, 0xca, 0x09, 0x54, 0x80, 0xcc, 0x93, 0x63, - 0x62, 0xfa, 0xd2, 0xfe, 0x81, 0xd5, 0xb1, 0x6c, 0xc2, 0x24, 0xc8, 0xbe, 0x4d, 0x9c, 0x72, 0x6a, - 0xe3, 0xcb, 0x0c, 0xcf, 0x8a, 0x8c, 0x7b, 0x4f, 0xe6, 0x1b, 0x1d, 0x02, 0x1a, 0x7d, 0x5d, 0x41, - 0x77, 0x46, 0x37, 0x66, 0xe2, 0x0b, 0x4d, 0xf5, 0xaf, 0xe7, 0x13, 0x96, 0x77, 0x6d, 0x3d, 0x81, - 0xda, 0x50, 0x3e, 0xf9, 0xfc, 0x81, 0x6e, 0x8f, 0x39, 0x5d, 0xc6, 0x3f, 0xb7, 0x54, 0x57, 0xcf, - 0x23, 0x1a, 0x37, 0xb6, 0xd9, 0x6c, 0x9e, 0x69, 0x6c, 0xc2, 0xeb, 0xc2, 0x38, 0x63, 0x93, 0x9e, - 0x0d, 0xf4, 0x04, 0x72, 0x60, 0x6e, 0xcf, 0x6d, 0x5a, 0x6f, 0xfb, 0xbf, 0x93, 0x3d, 0x1f, 0xe6, - 0xc6, 0x3c, 0xbc, 0xa0, 0x31, 0x1b, 0x32, 0xf9, 0xb5, 0xa7, 0x7a, 0xf7, 0x9c, 0xd2, 0x91, 0xd5, - 0x77, 0x30, 0xb7, 0x69, 0x1e, 0x06, 0x16, 0x8b, 0xdf, 0xba, 0x3d, 0x74, 0xfa, 0xef, 0x58, 0x54, - 0x2d, 0xb7, 0xce, 0x12, 0x0b, 0xed, 0xac, 0x68, 0xf7, 0xb4, 0xad, 0xf9, 0x9f, 0x3f, 0xcf, 0x6b, - 0x3f, 0xbc, 0x5f, 0xd6, 0x7e, 0x7a, 0xbf, 0xac, 0xfd, 0xf2, 0x7e, 0x59, 0xfb, 0xec, 0xd7, 0xe5, - 0x44, 0x23, 0x2b, 0xde, 0x0d, 0xff, 0xf6, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x31, 0x51, 0x41, - 0x1e, 0x8a, 0x14, 0x00, 0x00, + // 1705 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x23, 0x49, + 0x15, 0x77, 0xfb, 0xdb, 0xcf, 0x93, 0xd8, 0xa9, 0x64, 0x76, 0xbc, 0x8e, 0x26, 0x33, 0xdb, 0xc0, + 0x28, 0x93, 0x65, 0x33, 0x3b, 0x81, 0xdd, 0x41, 0x42, 0x42, 0x9b, 0x38, 0xc3, 0x6c, 0xd8, 0x64, + 0x36, 0xaa, 0xc4, 0xda, 0x13, 0xdb, 0x94, 0xdb, 0x35, 0xde, 0x1a, 0xb7, 0xbb, 0x9d, 0xea, 0xea, + 0x38, 0xbe, 0x21, 0xc1, 0x89, 0xbf, 0x80, 0x3f, 0x01, 0x71, 0x42, 0xe2, 0x06, 0xe2, 0x04, 0x07, + 0x8e, 0x1c, 0x39, 0xa2, 0xe1, 0xc2, 0x9f, 0x81, 0xea, 0xa3, 0xdb, 0xed, 0xd8, 0xce, 0x97, 0x56, + 0x70, 0xeb, 0x7e, 0xef, 0xf7, 0x7e, 0xef, 0xc3, 0xef, 0xbd, 0x2e, 0x17, 0xbc, 0xc7, 0x69, 0x18, + 0x44, 0xdc, 0xa5, 0xce, 0x80, 0xf8, 0xa4, 0x47, 0xf9, 0xf6, 0x90, 0x07, 0x22, 0x40, 0xf5, 0xcb, + 0xf2, 0xe6, 0x5a, 0x2f, 0xe8, 0x05, 0x4a, 0xf9, 0x4c, 0x3e, 0x69, 0x5c, 0xb3, 0xc6, 0xa3, 0x50, + 0xa8, 0x47, 0x2d, 0xb0, 0xd7, 0xe1, 0xfd, 0x43, 0x16, 0x0a, 0x6c, 0xcc, 0x5f, 0xf1, 0x20, 0x1a, + 0x86, 0x98, 0x9e, 0x45, 0x34, 0x14, 0xf6, 0xaf, 0x2d, 0x68, 0xce, 0xd3, 0x86, 0xc3, 0xc0, 0x0f, + 0x29, 0xfa, 0x08, 0x0a, 0x94, 0xf3, 0x80, 0x37, 0xac, 0xc7, 0xd6, 0x66, 0x75, 0xe7, 0xc1, 0xf6, + 0x4c, 0x70, 0x2f, 0xa5, 0x1a, 0x6b, 0x14, 0x7a, 0x01, 0xc5, 0x9e, 0x22, 0x68, 0x64, 0x1f, 0xe7, + 0x36, 0xab, 0x3b, 0x8f, 0x66, 0xf1, 0x53, 0x8e, 0xb0, 0x81, 0xdb, 0x07, 0xf0, 0xe0, 0x15, 0x9d, + 0x0e, 0xc2, 0x44, 0x88, 0xb6, 0x61, 0x35, 0x21, 0x51, 0x68, 0xc7, 0x27, 0x03, 0xaa, 0x02, 0xaa, + 0xe0, 0x15, 0x9e, 0x36, 0x79, 0x4d, 0x06, 0xd4, 0xfe, 0xa5, 0x05, 0x8d, 0x59, 0xae, 0xbb, 0xe5, + 0xf3, 0x09, 0x14, 0x94, 0xcb, 0x46, 0x56, 0xc1, 0xaf, 0x4d, 0x47, 0xa3, 0xed, 0x43, 0x68, 0xee, + 0x53, 0x8f, 0x0a, 0xfa, 0xad, 0x24, 0xf4, 0x0b, 0x58, 0x9f, 0xcb, 0x76, 0xb7, 0x94, 0x10, 0xe4, + 0x3b, 0x41, 0x77, 0xac, 0x32, 0xaa, 0x60, 0xf5, 0x6c, 0x1f, 0xc3, 0x83, 0xe3, 0x68, 0x7e, 0xf5, + 0x93, 0x0a, 0x58, 0xb7, 0xaa, 0xc0, 0xcf, 0xa1, 0x31, 0xcb, 0xf8, 0xed, 0x05, 0xfc, 0x27, 0x0b, + 0x56, 0x4f, 0x83, 0x3e, 0xf5, 0xf7, 0x22, 0xb7, 0x4f, 0x45, 0xdc, 0xcd, 0xe8, 0x33, 0x28, 0x73, + 0xfd, 0x18, 0x36, 0x2c, 0xd5, 0x81, 0xdf, 0x9d, 0x65, 0x4f, 0x19, 0x1a, 0x3b, 0x9c, 0x58, 0xa1, + 0x17, 0xd0, 0x10, 0x84, 0xf7, 0xa8, 0x70, 0x8c, 0xc8, 0x19, 0x52, 0xce, 0x82, 0xae, 0x33, 0x08, + 0x55, 0x04, 0x79, 0x7c, 0x5f, 0xeb, 0x8d, 0xe9, 0xb1, 0xd2, 0x1e, 0x85, 0x68, 0x13, 0xea, 0xae, + 0xc7, 0xa8, 0x2f, 0x9c, 0xc8, 0x67, 0x67, 0x11, 0x75, 0x58, 0xb7, 0x91, 0x53, 0x06, 0xcb, 0x5a, + 0xde, 0x56, 0xe2, 0x83, 0xae, 0xfd, 0x9f, 0x3c, 0xa0, 0xd9, 0x18, 0x6e, 0xdb, 0x16, 0xe8, 0x0b, + 0x28, 0xf3, 0xc8, 0x61, 0x82, 0x9a, 0xc8, 0xaa, 0x3b, 0xdb, 0x37, 0xc9, 0x75, 0x3b, 0xce, 0xb9, + 0xfd, 0x79, 0x06, 0x97, 0x78, 0x74, 0x20, 0x09, 0x50, 0x0f, 0x10, 0x27, 0x23, 0x27, 0xb1, 0xd7, + 0xb4, 0x39, 0x45, 0xfb, 0xe2, 0x56, 0xb4, 0x64, 0x14, 0xff, 0xea, 0x9f, 0x67, 0x70, 0x9d, 0x4f, + 0x5e, 0xb5, 0xa3, 0x0e, 0x6c, 0xb8, 0x81, 0x1f, 0x46, 0x83, 0xa1, 0x60, 0x81, 0xef, 0x84, 0xcc, + 0x77, 0xa9, 0xe3, 0x91, 0x30, 0xa9, 0x77, 0x23, 0xaf, 0x9c, 0x3e, 0x9c, 0x75, 0xda, 0x9a, 0xd8, + 0xe1, 0xf5, 0x14, 0xc9, 0x89, 0xe4, 0x38, 0x24, 0x61, 0x52, 0xc9, 0xef, 0xc0, 0x12, 0x0b, 0x9d, + 0x0e, 0x71, 0xfb, 0xb2, 0x8e, 0x7e, 0xb7, 0x51, 0x78, 0x6c, 0x6d, 0x96, 0xf1, 0x3d, 0x16, 0xee, + 0x25, 0x32, 0xf4, 0x10, 0x80, 0x85, 0x8e, 0x60, 0x6f, 0x3c, 0x12, 0x7e, 0xd3, 0x28, 0x2a, 0x44, + 0x85, 0x85, 0xa7, 0x5a, 0xd0, 0x7c, 0x0d, 0x95, 0xa4, 0x50, 0x68, 0x17, 0xaa, 0x71, 0x37, 0x70, + 0x27, 0x32, 0x9d, 0xf5, 0xc1, 0xbc, 0x51, 0x50, 0xa0, 0xb6, 0xcf, 0x84, 0xcc, 0x16, 0x57, 0x78, + 0x4c, 0xd1, 0x64, 0x80, 0x66, 0x2b, 0x84, 0x4e, 0x60, 0x2d, 0x21, 0x4e, 0x95, 0xff, 0x0a, 0x0f, + 0xd3, 0xf5, 0xc4, 0x88, 0xcf, 0x90, 0xee, 0x55, 0xa0, 0x64, 0xa4, 0xf6, 0x6f, 0x2c, 0x58, 0x9b, + 0x9e, 0x93, 0xbb, 0xcd, 0x60, 0x0b, 0x2a, 0xdc, 0x98, 0xc6, 0xab, 0xfd, 0x7b, 0xd7, 0x74, 0x85, + 0x46, 0xe3, 0x89, 0x9d, 0xfd, 0xab, 0xec, 0xd4, 0xd0, 0x26, 0xb1, 0xdc, 0xb6, 0xf1, 0x4f, 0x00, + 0xf5, 0x38, 0xf1, 0x05, 0xed, 0xca, 0x5f, 0xc3, 0x11, 0x92, 0x32, 0x8e, 0xea, 0xc9, 0x6c, 0x54, + 0xaf, 0x34, 0x16, 0xb7, 0xd3, 0xbe, 0x6b, 0xbd, 0x29, 0xa9, 0x1c, 0x80, 0x07, 0x09, 0x69, 0xcc, + 0x60, 0x98, 0x73, 0x8a, 0xf9, 0xd9, 0x62, 0xe6, 0x49, 0xed, 0xd3, 0x2e, 0xee, 0xc7, 0x2e, 0xd2, + 0xba, 0xd0, 0xfe, 0xb3, 0x05, 0x6b, 0xf3, 0x42, 0x42, 0x9f, 0x40, 0x5e, 0x8c, 0x87, 0x3a, 0xef, + 0xe5, 0x6b, 0xba, 0xeb, 0x74, 0x3c, 0xa4, 0x58, 0xc1, 0xd1, 0x3e, 0x2c, 0xc7, 0x81, 0x27, 0x95, + 0x58, 0x30, 0x40, 0xe9, 0xe8, 0x96, 0x8c, 0x91, 0x49, 0xff, 0x09, 0xd4, 0x04, 0x67, 0x6e, 0xdf, + 0xa3, 0x8e, 0x60, 0x03, 0xea, 0x98, 0xe1, 0xcf, 0xe1, 0x25, 0x23, 0x3e, 0x65, 0x03, 0x7a, 0x14, + 0xda, 0x7f, 0xb3, 0xe0, 0xe1, 0x95, 0x69, 0xdf, 0x20, 0x8d, 0x94, 0xdd, 0xff, 0x2b, 0x8d, 0xdf, + 0x67, 0xa1, 0x9a, 0x5a, 0x27, 0x08, 0x41, 0x81, 0x9b, 0xd1, 0xb6, 0x36, 0x2d, 0x9c, 0xe3, 0xb8, + 0x2d, 0x65, 0x23, 0x25, 0xcb, 0x6a, 0xd9, 0x08, 0xb7, 0xe5, 0xd2, 0xe0, 0x94, 0x74, 0x9d, 0xce, + 0x58, 0x50, 0x4d, 0x6d, 0xc9, 0x0e, 0x27, 0xdd, 0x3d, 0x29, 0x40, 0x8f, 0xa0, 0x3a, 0xe2, 0x4c, + 0x50, 0xa3, 0xcf, 0x2b, 0x3d, 0x28, 0x91, 0x06, 0x3c, 0x85, 0x15, 0x11, 0x08, 0xe2, 0x39, 0xee, + 0x30, 0x4a, 0x22, 0x2c, 0x28, 0xd8, 0xb2, 0x52, 0xb4, 0x86, 0x91, 0x0e, 0x11, 0x7d, 0x0c, 0xf7, + 0xc3, 0x33, 0xcf, 0xf1, 0xc8, 0x98, 0xf2, 0x29, 0x78, 0x51, 0xc1, 0x57, 0xc2, 0x33, 0xef, 0x50, + 0xea, 0x26, 0x16, 0x4f, 0x61, 0xa5, 0x7f, 0xee, 0xa8, 0xf8, 0xf8, 0xd0, 0x75, 0xdc, 0x20, 0xf2, + 0x45, 0xa3, 0xa4, 0xc9, 0xfb, 0xe7, 0x98, 0x92, 0x2e, 0x1e, 0xba, 0x2d, 0x29, 0x45, 0x1f, 0x02, + 0xea, 0x9f, 0x3b, 0x3a, 0xd6, 0x09, 0xb6, 0xac, 0xb0, 0xb5, 0xfe, 0xf9, 0x57, 0x52, 0x11, 0x83, + 0xed, 0xaf, 0xa1, 0x76, 0x69, 0xb1, 0xdd, 0xb5, 0x57, 0xd7, 0xa0, 0x70, 0x4e, 0xbc, 0x88, 0x9a, + 0x92, 0xea, 0x17, 0xc5, 0x3f, 0xbd, 0xd6, 0xee, 0xda, 0x44, 0xf3, 0xf9, 0xff, 0x9a, 0x83, 0xa5, + 0xa9, 0x93, 0x88, 0x3c, 0x52, 0xa4, 0x56, 0x8c, 0x7a, 0x46, 0xcf, 0x20, 0x3f, 0x08, 0xba, 0xda, + 0x74, 0x79, 0x67, 0x7d, 0xde, 0xb4, 0x07, 0xd1, 0xf0, 0x28, 0xe8, 0x52, 0xac, 0x80, 0xe8, 0x10, + 0xee, 0xc9, 0xf5, 0x13, 0x52, 0x21, 0x98, 0xdf, 0x8b, 0x3f, 0x96, 0x5b, 0x0b, 0x0c, 0x53, 0x05, + 0x39, 0x31, 0x16, 0x18, 0x78, 0x3b, 0x7e, 0x46, 0x5f, 0xc3, 0xfd, 0xa9, 0x0f, 0x70, 0x42, 0x9b, + 0xbf, 0x9a, 0x76, 0x52, 0x87, 0x84, 0x76, 0x95, 0xcf, 0x0a, 0x51, 0x13, 0xca, 0x43, 0xce, 0x02, + 0xce, 0xc4, 0x58, 0x35, 0xdc, 0x12, 0x4e, 0xde, 0xd1, 0x21, 0xd4, 0x79, 0xe4, 0x93, 0x11, 0x19, + 0x4f, 0xdc, 0x16, 0x95, 0xdb, 0x79, 0x95, 0xd7, 0xc8, 0xc4, 0x5b, 0x8d, 0x4f, 0x0b, 0x50, 0x1b, + 0x56, 0x27, 0x9f, 0xde, 0x09, 0x61, 0x49, 0x11, 0xce, 0x39, 0x8e, 0x4d, 0xbe, 0xc9, 0x09, 0x27, + 0xea, 0xcc, 0xc8, 0xec, 0x9f, 0x41, 0x63, 0x51, 0x21, 0xd1, 0x36, 0xe4, 0xe2, 0xe1, 0xbd, 0x76, + 0x63, 0x64, 0x79, 0xdb, 0xfe, 0x8b, 0x15, 0x93, 0xcd, 0xa9, 0xd4, 0x33, 0xc8, 0xb9, 0xc3, 0x1b, + 0x92, 0x49, 0x24, 0xfa, 0x14, 0x4a, 0x2c, 0x50, 0x73, 0x77, 0xb3, 0x9d, 0x55, 0x64, 0x81, 0x1c, + 0x46, 0xf4, 0x23, 0x28, 0xb3, 0x40, 0x0f, 0xa1, 0x69, 0x9e, 0x6b, 0x0c, 0x4b, 0x2c, 0x50, 0x93, + 0x69, 0xf7, 0xa0, 0x9a, 0x5e, 0xb9, 0x9f, 0x41, 0x39, 0x29, 0xb3, 0xb5, 0xa8, 0xcc, 0xca, 0xe0, + 0x90, 0x0d, 0x52, 0xfd, 0x97, 0x58, 0xa1, 0xf7, 0xa0, 0x98, 0xda, 0xba, 0x16, 0x36, 0x6f, 0xf6, + 0x99, 0x39, 0xa9, 0x4e, 0xd9, 0xa1, 0x75, 0xa8, 0xbc, 0x61, 0x9e, 0xe7, 0x70, 0x22, 0xf4, 0x0c, + 0xe5, 0x71, 0x59, 0x0a, 0x30, 0x11, 0x54, 0xee, 0xc0, 0x4e, 0xc4, 0x43, 0xe1, 0x78, 0xd2, 0x46, + 0xf1, 0xe5, 0x30, 0x28, 0x91, 0x62, 0x91, 0x3b, 0x74, 0x40, 0x2e, 0x26, 0x1f, 0x57, 0xb5, 0x43, + 0x07, 0xe4, 0xc2, 0x7c, 0x1f, 0x3f, 0x80, 0x82, 0x3a, 0x7a, 0xa0, 0x06, 0x94, 0x06, 0x34, 0x0c, + 0x49, 0x2f, 0x9e, 0xd3, 0xf8, 0xd5, 0xfe, 0x09, 0x54, 0x4d, 0x17, 0xe2, 0xc8, 0x93, 0x93, 0xbb, + 0x46, 0x2f, 0xa8, 0xeb, 0x50, 0x8f, 0x0c, 0x43, 0xf9, 0xfd, 0x30, 0x8b, 0x52, 0x47, 0xb6, 0x22, + 0x75, 0x2f, 0xb5, 0xca, 0x6c, 0xff, 0x73, 0xb8, 0x67, 0xec, 0xbf, 0x22, 0xc2, 0xfd, 0x46, 0x1e, + 0x40, 0xe4, 0x09, 0x94, 0xf9, 0x3d, 0xa7, 0x1b, 0x71, 0xa2, 0x0e, 0xa6, 0xc6, 0x3e, 0x87, 0x57, + 0x8c, 0x6a, 0xdf, 0x68, 0x8e, 0x42, 0xf4, 0xa9, 0xd9, 0x4e, 0x7a, 0x55, 0xd8, 0x0b, 0x67, 0x44, + 0xb1, 0x4f, 0xd6, 0x93, 0xfd, 0x47, 0x0b, 0x6a, 0x97, 0xc6, 0x07, 0x3d, 0x87, 0x3c, 0x8f, 0x3c, + 0xba, 0xb8, 0xdd, 0x52, 0x99, 0x62, 0x05, 0x95, 0x7f, 0xb2, 0x89, 0x2b, 0x43, 0x31, 0x01, 0x3c, + 0x5a, 0x68, 0xb4, 0xab, 0x60, 0xd8, 0xc0, 0xd1, 0x0f, 0xa1, 0x30, 0x92, 0x21, 0x99, 0x6e, 0xdb, + 0xb8, 0x3a, 0x70, 0xac, 0xc1, 0xf6, 0x73, 0x40, 0xb3, 0x23, 0x2a, 0x7b, 0xe0, 0x6d, 0xd0, 0x71, + 0x64, 0x5e, 0xfa, 0xaf, 0x56, 0x05, 0x97, 0xdf, 0x06, 0x1d, 0x99, 0x6d, 0xb8, 0xf5, 0xfe, 0xd4, + 0x17, 0x43, 0xca, 0x50, 0x11, 0xb2, 0xb8, 0x5d, 0xcf, 0x6c, 0xfd, 0x78, 0x6a, 0xd9, 0x2b, 0x55, + 0x09, 0x72, 0xad, 0xe3, 0x76, 0x3d, 0x83, 0x96, 0x01, 0x0e, 0xbe, 0x94, 0xa3, 0xf1, 0x53, 0x2f, + 0x18, 0xd5, 0x2d, 0x54, 0x83, 0xea, 0xc1, 0x97, 0xaa, 0xe3, 0x95, 0x20, 0xbb, 0xf5, 0x1c, 0x2a, + 0xc9, 0x16, 0x46, 0x55, 0x28, 0xb5, 0xfd, 0xbe, 0x1f, 0x8c, 0xfc, 0x7a, 0x06, 0x01, 0x14, 0x71, + 0x5b, 0x8a, 0xeb, 0x96, 0x54, 0x60, 0x32, 0x52, 0x2f, 0xd9, 0xad, 0x16, 0x2c, 0x4d, 0x15, 0x43, + 0x3a, 0x79, 0x1d, 0xf8, 0x54, 0xbf, 0x69, 0xcb, 0x7d, 0x3e, 0xc6, 0x91, 0x5f, 0xb7, 0xd0, 0x3d, + 0x28, 0xb7, 0x82, 0xc0, 0xdb, 0x97, 0x9c, 0x59, 0x54, 0x86, 0xfc, 0x17, 0xcc, 0xf3, 0xea, 0xb9, + 0xad, 0x16, 0xd4, 0x2f, 0xff, 0xa4, 0x68, 0x09, 0x2a, 0x92, 0x47, 0x09, 0xea, 0x19, 0x54, 0x81, + 0xc2, 0xcb, 0x0b, 0xe2, 0x0a, 0xed, 0xff, 0x84, 0x0d, 0x98, 0x47, 0xb8, 0x26, 0x39, 0xf6, 0x88, + 0x5f, 0xcf, 0xed, 0xfc, 0xa1, 0x20, 0xab, 0xa2, 0xf3, 0x3e, 0xd2, 0xf5, 0x46, 0x67, 0x80, 0x66, + 0x2f, 0x5f, 0xd0, 0x87, 0xb3, 0x3f, 0xcc, 0xc2, 0x0b, 0x9c, 0xe6, 0xf7, 0x6f, 0x06, 0xd6, 0x67, + 0x6d, 0x3b, 0x83, 0xfa, 0x50, 0xbf, 0x7c, 0x3b, 0x82, 0x9e, 0xce, 0xf9, 0xba, 0xcc, 0xbf, 0x8d, + 0x69, 0x6e, 0xdd, 0x04, 0x9a, 0x76, 0xb6, 0xdb, 0xed, 0x5e, 0xeb, 0x6c, 0xc1, 0xe5, 0xc3, 0x3c, + 0x67, 0x8b, 0x6e, 0x15, 0xec, 0x0c, 0xf2, 0x61, 0xf5, 0x28, 0xe8, 0xb2, 0x37, 0xe3, 0xff, 0x91, + 0x3f, 0x01, 0xab, 0x73, 0xee, 0x65, 0xd0, 0x9c, 0x1f, 0x64, 0xf1, 0x65, 0x50, 0xf3, 0xa3, 0x1b, + 0xa2, 0x13, 0xaf, 0x6f, 0x61, 0x75, 0xd7, 0x3d, 0x8b, 0x18, 0x4f, 0x9f, 0xba, 0x43, 0x74, 0xf5, + 0xdf, 0xb1, 0xa4, 0x5b, 0x9e, 0x5c, 0x07, 0x8b, 0xfd, 0x6c, 0x5a, 0x1f, 0x5b, 0x7b, 0x6b, 0xff, + 0xfc, 0x5d, 0xd9, 0xfa, 0xfb, 0xbb, 0x0d, 0xeb, 0x1f, 0xef, 0x36, 0xac, 0x7f, 0xbd, 0xdb, 0xb0, + 0x7e, 0xfb, 0xef, 0x8d, 0x4c, 0xa7, 0xa8, 0xae, 0x15, 0x7f, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xea, 0x43, 0xed, 0xd1, 0xa9, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2735,6 +2744,16 @@ func (m *TokenBucketRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.IsTiflash { + i-- + if m.IsTiflash { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x30 + } if m.IsBackground { i-- if m.IsBackground { @@ -3938,6 +3957,9 @@ func (m *TokenBucketRequest) Size() (n int) { if m.IsBackground { n += 2 } + if m.IsTiflash { + n += 2 + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -5480,6 +5502,26 @@ func (m *TokenBucketRequest) Unmarshal(dAtA []byte) error { } } m.IsBackground = bool(v != 0) + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsTiflash", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IsTiflash = bool(v != 0) default: iNdEx = preIndex skippy, err := skipResourceManager(dAtA[iNdEx:]) diff --git a/pkg/tracepb/tracepb.pb.go b/pkg/tracepb/tracepb.pb.go index 55cf091a7..e5b4919fe 100644 --- a/pkg/tracepb/tracepb.pb.go +++ b/pkg/tracepb/tracepb.pb.go @@ -68,7 +68,6 @@ var xxx_messageInfo_TraceRecordRequest proto.InternalMessageInfo type TraceRecord struct { // Types that are valid to be assigned to RecordOneof: - // // *TraceRecord_Report // *TraceRecord_NotifyCollect RecordOneof isTraceRecord_RecordOneof `protobuf_oneof:"record_oneof"` diff --git a/proto/mpp.proto b/proto/mpp.proto index c62a6c574..e7fa9eaf7 100644 --- a/proto/mpp.proto +++ b/proto/mpp.proto @@ -27,6 +27,7 @@ message TaskMeta { string coordinator_address = 11; // coordinator_address of this query 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; } message IsAliveRequest { diff --git a/proto/resource_manager.proto b/proto/resource_manager.proto index ada01efe7..a0367cef2 100644 --- a/proto/resource_manager.proto +++ b/proto/resource_manager.proto @@ -82,6 +82,7 @@ message TokenBucketRequest { Consumption consumption_since_last_request = 4; // label background request. bool is_background = 5; + bool is_tiflash = 6; } message TokenBucketsResponse { @@ -219,4 +220,4 @@ message RunawaySettings { message BackgroundSettings { repeated string job_types = 1; -} \ No newline at end of file +} diff --git a/scripts/proto.lock b/scripts/proto.lock index 95d718e95..f0af486b1 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -12047,6 +12047,11 @@ "id": 16, "name": "api_version", "type": "kvrpcpb.APIVersion" + }, + { + "id": 17, + "name": "resource_group_name", + "type": "string" } ] }, @@ -18114,6 +18119,11 @@ "id": 5, "name": "is_background", "type": "bool" + }, + { + "id": 6, + "name": "is_tiflash", + "type": "bool" } ], "messages": [