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/disaggregated/disaggregated.pb.go b/pkg/disaggregated/disaggregated.pb.go index d76bfc7f7..322243880 100644 --- a/pkg/disaggregated/disaggregated.pb.go +++ b/pkg/disaggregated/disaggregated.pb.go @@ -614,7 +614,8 @@ func (m *GetDisaggConfigResponse) GetS3Config() *DisaggS3Config { type DisaggTaskMeta struct { StartTs uint64 `protobuf:"varint,1,opt,name=start_ts,json=startTs,proto3" json:"start_ts,omitempty"` - // query_ts + server_id + local_query_id to represent a global unique query. + // gather_id + query_ts + server_id + local_query_id to represent a global unique query. + GatherId int64 `protobuf:"varint,9,opt,name=gather_id,json=gatherId,proto3" json:"gather_id,omitempty"` QueryTs uint64 `protobuf:"varint,2,opt,name=query_ts,json=queryTs,proto3" json:"query_ts,omitempty"` ServerId uint64 `protobuf:"varint,3,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"` LocalQueryId uint64 `protobuf:"varint,4,opt,name=local_query_id,json=localQueryId,proto3" json:"local_query_id,omitempty"` @@ -667,6 +668,13 @@ func (m *DisaggTaskMeta) GetStartTs() uint64 { return 0 } +func (m *DisaggTaskMeta) GetGatherId() int64 { + if m != nil { + return m.GatherId + } + return 0 +} + func (m *DisaggTaskMeta) GetQueryTs() uint64 { if m != nil { return m.QueryTs @@ -1481,79 +1489,79 @@ func init() { func init() { proto.RegisterFile("disaggregated.proto", fileDescriptor_1026192e39a9f8dc) } var fileDescriptor_1026192e39a9f8dc = []byte{ - // 1141 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x72, 0xdb, 0x44, - 0x14, 0x8e, 0x62, 0xc7, 0x92, 0x8f, 0x9c, 0xd2, 0x6e, 0x4b, 0xa3, 0xa4, 0x34, 0x04, 0x0d, 0x33, - 0x98, 0x9b, 0xcc, 0x34, 0x29, 0x30, 0xd3, 0x81, 0x32, 0xfd, 0x25, 0x86, 0x94, 0x86, 0x4d, 0xe8, - 0x70, 0xa7, 0xd9, 0x48, 0xa7, 0x8e, 0x46, 0xb2, 0x56, 0xd9, 0x5d, 0x07, 0xf2, 0x14, 0xdc, 0x32, - 0x3c, 0x04, 0x0f, 0x00, 0x2f, 0xc0, 0x1d, 0x3c, 0x02, 0x53, 0x78, 0x10, 0x66, 0x7f, 0x64, 0xc7, - 0xae, 0xf9, 0xe9, 0xc0, 0x95, 0xf5, 0x9d, 0xbf, 0x3d, 0xe7, 0x3b, 0x7b, 0xce, 0x1a, 0xae, 0x66, - 0xb9, 0x64, 0xc3, 0xa1, 0xc0, 0x21, 0x53, 0x98, 0x6d, 0xd7, 0x82, 0x2b, 0x4e, 0x56, 0x67, 0x84, - 0x1b, 0x57, 0x52, 0x5e, 0x0b, 0x9e, 0xa2, 0x94, 0x5c, 0x58, 0x8b, 0x8d, 0xd5, 0xe2, 0x4c, 0xd4, - 0x69, 0x7d, 0x6c, 0x61, 0xfc, 0xa3, 0x07, 0xbd, 0xc3, 0xdd, 0x7d, 0x9e, 0x16, 0x14, 0xe5, 0xb8, - 0x54, 0x64, 0x07, 0x7c, 0x39, 0x4e, 0xb5, 0x4b, 0xe4, 0x6d, 0x79, 0xfd, 0x70, 0xe7, 0xfa, 0xf6, - 0xec, 0x41, 0x87, 0x56, 0xbb, 0xb7, 0x44, 0x1b, 0x43, 0xf2, 0x3e, 0x74, 0x2b, 0xae, 0x12, 0xfe, - 0x75, 0x85, 0x22, 0x5a, 0x36, 0x5e, 0x6b, 0x73, 0x5e, 0x9f, 0x73, 0xf5, 0x54, 0xab, 0xf7, 0x96, - 0x68, 0x50, 0xb9, 0x6f, 0xf2, 0x1e, 0x04, 0x29, 0xaf, 0x9e, 0x97, 0x79, 0xaa, 0xa2, 0xd6, 0x42, - 0xb7, 0x07, 0x4e, 0xad, 0xdd, 0x1a, 0xd3, 0xfb, 0x3e, 0xac, 0xa0, 0x10, 0x5c, 0xc4, 0x5d, 0xf0, - 0x5d, 0x36, 0x31, 0x40, 0xd0, 0x1c, 0x11, 0xc7, 0x10, 0x34, 0x7e, 0xe4, 0x3a, 0x74, 0x04, 0x32, - 0xc9, 0x2b, 0x53, 0x4d, 0x97, 0x3a, 0x14, 0x9f, 0xc1, 0x95, 0x23, 0x71, 0x7e, 0x2f, 0xcb, 0x6c, - 0xe9, 0xa7, 0x63, 0x94, 0x8a, 0xc4, 0xb0, 0x9a, 0x31, 0xc5, 0x92, 0xe7, 0x79, 0x89, 0x49, 0x81, - 0xe7, 0xc6, 0xa7, 0x47, 0x43, 0x2d, 0x7c, 0x9c, 0x97, 0xf8, 0x19, 0x9e, 0x6b, 0x9b, 0x92, 0xa7, - 0x45, 0x22, 0x15, 0x17, 0x98, 0xe4, 0x99, 0x49, 0xbc, 0x4d, 0x43, 0x2d, 0x3c, 0xd4, 0xb2, 0x41, - 0x46, 0xd6, 0x21, 0xb0, 0x36, 0x78, 0x1a, 0xb5, 0x8d, 0xda, 0x37, 0x6a, 0x3c, 0x8d, 0x07, 0x40, - 0x2e, 0x9e, 0x2b, 0x6b, 0x5e, 0x49, 0x24, 0xbb, 0x3a, 0x4b, 0x4d, 0xbf, 0xe3, 0xfc, 0xc6, 0x3c, - 0xe7, 0x17, 0x3a, 0x44, 0x9d, 0x69, 0x7c, 0x07, 0xae, 0x1d, 0x89, 0xf3, 0x27, 0x4c, 0x14, 0x0f, - 0xb1, 0x44, 0x85, 0xaf, 0x50, 0x45, 0xbc, 0x0f, 0xaf, 0xcf, 0xf9, 0xfe, 0x97, 0x4c, 0x22, 0xb8, - 0xfe, 0x09, 0xaa, 0x87, 0xc6, 0x50, 0x33, 0x9f, 0x0f, 0x5d, 0x2e, 0xf1, 0x57, 0x70, 0xc9, 0x8a, - 0x0f, 0x77, 0xad, 0x42, 0x37, 0xe4, 0x78, 0x9c, 0x16, 0xa8, 0x9a, 0x86, 0x58, 0x44, 0x08, 0xb4, - 0x05, 0xe7, 0xca, 0x5c, 0x9f, 0x2e, 0x35, 0xdf, 0x64, 0x03, 0x02, 0xac, 0xb2, 0x9a, 0xe7, 0x95, - 0xbd, 0x1f, 0x5d, 0x3a, 0xc1, 0xf1, 0x97, 0xb0, 0xf6, 0xd2, 0x99, 0xae, 0x86, 0x3b, 0xd0, 0x95, - 0xbb, 0x49, 0x6a, 0x84, 0xae, 0x8c, 0x9b, 0x73, 0x65, 0xcc, 0x26, 0x45, 0x03, 0xe9, 0xbe, 0xe2, - 0xef, 0x97, 0x9b, 0x8c, 0x8f, 0x98, 0x2c, 0x9e, 0xa0, 0x62, 0xba, 0x9b, 0x52, 0x31, 0xa1, 0x12, - 0x65, 0x47, 0xa2, 0x4d, 0x7d, 0x83, 0x8f, 0xa4, 0x56, 0x9d, 0x8e, 0x51, 0x9c, 0x6b, 0xd5, 0xb2, - 0x55, 0x19, 0x7c, 0x24, 0xc9, 0x0d, 0xe8, 0x4a, 0x14, 0x67, 0x28, 0xa6, 0x77, 0x24, 0xb0, 0x82, - 0x41, 0x46, 0xde, 0x86, 0x4b, 0x25, 0x4f, 0x59, 0x99, 0x58, 0xef, 0x3c, 0x73, 0xd7, 0xa4, 0x67, - 0xa4, 0x5f, 0x68, 0xe1, 0x20, 0x23, 0x6b, 0xe0, 0x2b, 0x26, 0x0b, 0xad, 0x5e, 0xd9, 0xf2, 0xfa, - 0x2d, 0xda, 0xd1, 0x70, 0x90, 0x91, 0x37, 0x21, 0xc4, 0x6f, 0x30, 0x1d, 0x2b, 0x6e, 0xa2, 0x77, - 0x0c, 0x35, 0xd0, 0x88, 0xac, 0x41, 0x81, 0xe7, 0xb2, 0x66, 0xa9, 0xb9, 0xa2, 0xfe, 0x96, 0xd7, - 0x5f, 0xa5, 0xd0, 0x88, 0x06, 0x19, 0xb9, 0x0d, 0x21, 0xab, 0xf3, 0xe4, 0x0c, 0x85, 0xcc, 0x79, - 0x15, 0x05, 0x5b, 0x5e, 0xff, 0xd2, 0xce, 0xd5, 0xed, 0x66, 0x37, 0xdc, 0x3b, 0x18, 0x3c, 0xb3, - 0x2a, 0x0a, 0xac, 0xce, 0xdd, 0x77, 0xfc, 0x01, 0xbc, 0x66, 0xb9, 0xa1, 0xc8, 0xb2, 0x47, 0x7a, - 0x04, 0x75, 0xdb, 0x52, 0x9e, 0xa1, 0x21, 0x66, 0x85, 0x9a, 0x6f, 0x72, 0x19, 0x5a, 0x23, 0x39, - 0x74, 0x9d, 0xd4, 0x9f, 0xf1, 0x1f, 0x1e, 0x44, 0x8f, 0xa4, 0x62, 0xc7, 0x65, 0x2e, 0x4f, 0xa6, - 0xf4, 0xda, 0x10, 0x1f, 0x43, 0xcf, 0x8c, 0x73, 0x22, 0x70, 0x98, 0xbb, 0x41, 0x0d, 0x77, 0x36, - 0xe6, 0x3a, 0x66, 0x6c, 0xa9, 0xb1, 0xd8, 0x5b, 0xa2, 0x21, 0x4e, 0xe1, 0x34, 0x80, 0x1e, 0x32, - 0xcc, 0xdc, 0x06, 0x5a, 0x18, 0x60, 0xdf, 0x58, 0x4c, 0x02, 0x58, 0x48, 0x3e, 0x04, 0x0b, 0x13, - 0xae, 0x4e, 0x50, 0x44, 0xa9, 0xf1, 0x5f, 0x5f, 0xe4, 0xff, 0x54, 0x1b, 0xec, 0x2d, 0x51, 0xc0, - 0x09, 0xba, 0x1f, 0x40, 0xc7, 0x20, 0x19, 0xdf, 0x85, 0xf0, 0x42, 0x9a, 0x0d, 0x0f, 0xde, 0x84, - 0x07, 0x72, 0x13, 0xc0, 0x16, 0x99, 0xe4, 0x99, 0xbe, 0x31, 0xad, 0x7e, 0x9b, 0x76, 0xad, 0x64, - 0x90, 0xc9, 0xf8, 0x53, 0xe7, 0xef, 0xd2, 0x7a, 0xd9, 0xff, 0x5d, 0xe8, 0x4c, 0x6a, 0x6c, 0xf5, - 0xc3, 0x9d, 0x2b, 0x93, 0x8e, 0x69, 0x97, 0x41, 0xf5, 0x9c, 0x53, 0x67, 0x10, 0xef, 0x00, 0x4c, - 0x33, 0xfe, 0x97, 0x6d, 0xfa, 0x69, 0x19, 0x36, 0x16, 0xb4, 0xa9, 0x59, 0x2c, 0xb7, 0xa0, 0x3d, - 0x42, 0xc5, 0xfe, 0x76, 0xa4, 0x9a, 0xa9, 0xa1, 0xc6, 0x94, 0x44, 0xe0, 0xb3, 0x2c, 0x13, 0xfa, - 0x35, 0xb1, 0xe7, 0x34, 0x50, 0xcf, 0x87, 0xca, 0x47, 0xc8, 0xc7, 0x2a, 0x91, 0x66, 0x3e, 0x5a, - 0x34, 0x70, 0x82, 0x43, 0x72, 0x0b, 0x7c, 0xcb, 0x8a, 0x8c, 0xda, 0xa6, 0xd0, 0xb5, 0xed, 0x8b, - 0x2f, 0x99, 0xe5, 0xd7, 0x94, 0xdb, 0xd8, 0x69, 0x6a, 0x65, 0x7a, 0x82, 0x23, 0xa6, 0x2f, 0xb5, - 0x9b, 0x97, 0xae, 0x95, 0x3c, 0x43, 0x41, 0xee, 0xc2, 0xaa, 0xae, 0x0b, 0x93, 0x26, 0x6e, 0xc7, - 0xc4, 0x5d, 0x9f, 0x89, 0x7b, 0xa4, 0x2d, 0x6c, 0x70, 0x49, 0x7b, 0xea, 0x02, 0x22, 0x6f, 0x41, - 0x0f, 0x2b, 0x4d, 0x5b, 0x96, 0xd4, 0x25, 0xab, 0xcc, 0x48, 0xf5, 0x68, 0xe8, 0x64, 0x07, 0x25, - 0xab, 0xe2, 0x5f, 0x3c, 0xb8, 0xb1, 0x90, 0x3d, 0xb7, 0x96, 0x3e, 0x72, 0xcf, 0x96, 0xe3, 0xef, - 0x9d, 0xf9, 0xfb, 0xf5, 0x17, 0xf3, 0x41, 0xad, 0x97, 0x5d, 0x43, 0x33, 0x6f, 0x8e, 0x2f, 0xdd, - 0x7b, 0x73, 0x17, 0x42, 0x59, 0xb1, 0x5a, 0x9e, 0x70, 0xd5, 0xec, 0x92, 0x7f, 0xec, 0x0f, 0x34, - 0x1e, 0x83, 0x4c, 0xef, 0x64, 0x53, 0xac, 0x8c, 0x56, 0xb6, 0x5a, 0xfd, 0x1e, 0x75, 0x28, 0xde, - 0x87, 0xb5, 0x07, 0xac, 0x4a, 0xb1, 0xfc, 0x3f, 0xee, 0x42, 0xbc, 0x01, 0xd1, 0xcb, 0xd1, 0x2c, - 0x37, 0xf1, 0x0f, 0x1e, 0xac, 0x3d, 0x46, 0x95, 0xba, 0xe2, 0x0f, 0xd8, 0x10, 0x65, 0x73, 0xd4, - 0x5c, 0x75, 0xde, 0xab, 0x56, 0xb7, 0x0e, 0x81, 0x6d, 0x7d, 0x6e, 0x57, 0x43, 0x8b, 0xfa, 0x06, - 0x0f, 0x32, 0x73, 0x69, 0x70, 0x38, 0xc2, 0x4a, 0x4d, 0x59, 0xed, 0x3a, 0x89, 0xf5, 0xac, 0xd9, - 0x10, 0xcd, 0xb0, 0xb6, 0xcd, 0xb0, 0xfa, 0x1a, 0xeb, 0x51, 0xfd, 0xd6, 0x83, 0xd0, 0x64, 0x79, - 0xc0, 0xcc, 0xf3, 0x75, 0x7b, 0xb6, 0xb9, 0x9b, 0x0b, 0xd3, 0x9b, 0xac, 0xcd, 0xa6, 0xa7, 0xd7, - 0x60, 0x45, 0x07, 0xb4, 0xab, 0xa0, 0x47, 0x2d, 0xd0, 0xed, 0x48, 0x4f, 0xc6, 0x55, 0xa1, 0xe7, - 0xc2, 0xb4, 0xc3, 0x22, 0xf2, 0x06, 0x74, 0xe5, 0x78, 0x34, 0x62, 0x22, 0x47, 0x9b, 0x4f, 0x8f, - 0x4e, 0x05, 0xf7, 0xe3, 0x9f, 0x5f, 0x6c, 0x7a, 0xbf, 0xbe, 0xd8, 0xf4, 0x7e, 0x7b, 0xb1, 0xe9, - 0x7d, 0xf7, 0xfb, 0xe6, 0x12, 0x5c, 0xe6, 0x62, 0xb8, 0xad, 0xf2, 0xe2, 0x6c, 0xbb, 0x38, 0x33, - 0xff, 0xf6, 0x8e, 0x3b, 0xe6, 0x67, 0xf7, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xd1, 0xfd, - 0x96, 0x3c, 0x0a, 0x00, 0x00, + // 1150 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0xdc, 0x44, + 0x14, 0x8e, 0xb3, 0x9b, 0xb5, 0x7d, 0xbc, 0x29, 0xed, 0xb4, 0x34, 0x4e, 0x4a, 0x43, 0xb0, 0x90, + 0x58, 0x6e, 0x22, 0x35, 0x29, 0x20, 0x55, 0x50, 0xd4, 0x5f, 0xb2, 0x90, 0xd2, 0x30, 0x09, 0x15, + 0x77, 0xd6, 0xc4, 0x3e, 0xdd, 0x58, 0xf6, 0x7a, 0x9c, 0x99, 0xd9, 0x40, 0x9e, 0x82, 0x5b, 0x9e, + 0x82, 0x5b, 0x24, 0x78, 0x01, 0xee, 0xe0, 0x11, 0x50, 0xe1, 0x41, 0xd0, 0xfc, 0x78, 0x93, 0x6c, + 0x97, 0x9f, 0x0a, 0xae, 0xd6, 0xdf, 0x99, 0xf3, 0x9d, 0x39, 0xff, 0xb3, 0x70, 0x35, 0x2f, 0x24, + 0x1b, 0x8d, 0x04, 0x8e, 0x98, 0xc2, 0x7c, 0xb3, 0x11, 0x5c, 0x71, 0xb2, 0x7c, 0x41, 0xb8, 0x76, + 0x25, 0xe3, 0x8d, 0xe0, 0x19, 0x4a, 0xc9, 0x85, 0xd5, 0x58, 0x5b, 0x2e, 0x4f, 0x44, 0x93, 0x35, + 0x87, 0x16, 0x26, 0x3f, 0x7a, 0xd0, 0xdf, 0xdf, 0xde, 0xe5, 0x59, 0x49, 0x51, 0x4e, 0x2a, 0x45, + 0xb6, 0xc0, 0x97, 0x93, 0x4c, 0x53, 0x62, 0x6f, 0xc3, 0x1b, 0x44, 0x5b, 0xd7, 0x37, 0x2f, 0x5e, + 0xb4, 0x6f, 0x4f, 0x77, 0x16, 0x68, 0xab, 0x48, 0xde, 0x87, 0xb0, 0xe6, 0x2a, 0xe5, 0x5f, 0xd7, + 0x28, 0xe2, 0x45, 0xc3, 0x5a, 0x99, 0x61, 0x7d, 0xce, 0xd5, 0x53, 0x7d, 0xbc, 0xb3, 0x40, 0x83, + 0xda, 0x7d, 0x93, 0xf7, 0x20, 0xc8, 0x78, 0xfd, 0xbc, 0x2a, 0x32, 0x15, 0x77, 0xe6, 0xd2, 0x1e, + 0xb8, 0x63, 0x4d, 0x6b, 0x55, 0xef, 0xfb, 0xb0, 0x84, 0x42, 0x70, 0x91, 0x84, 0xe0, 0x3b, 0x6f, + 0x12, 0x80, 0xa0, 0xbd, 0x22, 0x49, 0x20, 0x68, 0x79, 0xe4, 0x3a, 0xf4, 0x04, 0x32, 0xc9, 0x6b, + 0x13, 0x4d, 0x48, 0x1d, 0x4a, 0x4e, 0xe0, 0xca, 0x81, 0x38, 0xbd, 0x97, 0xe7, 0x36, 0xf4, 0xe3, + 0x09, 0x4a, 0x45, 0x12, 0x58, 0xce, 0x99, 0x62, 0xe9, 0xf3, 0xa2, 0xc2, 0xb4, 0xc4, 0x53, 0xc3, + 0xe9, 0xd3, 0x48, 0x0b, 0x1f, 0x17, 0x15, 0x7e, 0x86, 0xa7, 0x5a, 0xa7, 0xe2, 0x59, 0x99, 0x4a, + 0xc5, 0x05, 0xa6, 0x45, 0x6e, 0x1c, 0xef, 0xd2, 0x48, 0x0b, 0xf7, 0xb5, 0x6c, 0x98, 0x93, 0x55, + 0x08, 0xac, 0x0e, 0x1e, 0xc7, 0x5d, 0x73, 0xec, 0x9b, 0x63, 0x3c, 0x4e, 0x86, 0x40, 0xce, 0xdf, + 0x2b, 0x1b, 0x5e, 0x4b, 0x24, 0xdb, 0xda, 0x4b, 0x9d, 0x7e, 0x97, 0xf3, 0x1b, 0xb3, 0x39, 0x3f, + 0x57, 0x21, 0xea, 0x54, 0x93, 0x3b, 0x70, 0xed, 0x40, 0x9c, 0x3e, 0x61, 0xa2, 0x7c, 0x88, 0x15, + 0x2a, 0x7c, 0x85, 0x28, 0x92, 0x5d, 0x78, 0x7d, 0x86, 0xfb, 0x5f, 0x3c, 0x89, 0xe1, 0xfa, 0x27, + 0xa8, 0x1e, 0x1a, 0x45, 0x9d, 0xf9, 0x62, 0xe4, 0x7c, 0x49, 0xbe, 0x82, 0x4b, 0x56, 0xbc, 0xbf, + 0x6d, 0x0f, 0x74, 0x41, 0x0e, 0x27, 0x59, 0x89, 0xaa, 0x2d, 0x88, 0x45, 0x84, 0x40, 0x57, 0x70, + 0xae, 0x4c, 0xfb, 0x84, 0xd4, 0x7c, 0x93, 0x35, 0x08, 0xb0, 0xce, 0x1b, 0x5e, 0xd4, 0xb6, 0x3f, + 0x42, 0x3a, 0xc5, 0xc9, 0x97, 0xb0, 0xf2, 0xd2, 0x9d, 0x2e, 0x86, 0x3b, 0x10, 0xca, 0xed, 0x34, + 0x33, 0x42, 0x17, 0xc6, 0xcd, 0x99, 0x30, 0x2e, 0x3a, 0x45, 0x03, 0xe9, 0xbe, 0x92, 0x1f, 0x16, + 0x5b, 0x8f, 0x0f, 0x98, 0x2c, 0x9f, 0xa0, 0x62, 0xba, 0x9a, 0x52, 0x31, 0xa1, 0x52, 0x65, 0x47, + 0xa2, 0x4b, 0x7d, 0x83, 0x0f, 0x24, 0xb9, 0x01, 0xe1, 0x88, 0xa9, 0x23, 0x14, 0xba, 0x11, 0xc2, + 0x0d, 0x6f, 0xd0, 0xa1, 0x81, 0x15, 0xd8, 0x2e, 0x38, 0x9e, 0xa0, 0x38, 0xd5, 0xbc, 0x45, 0xcb, + 0x33, 0xd8, 0xf2, 0x24, 0x8a, 0x13, 0xcb, 0xb3, 0x0d, 0x14, 0x58, 0xc1, 0x30, 0x27, 0x6f, 0xc3, + 0xa5, 0x8a, 0x67, 0xac, 0x4a, 0x2d, 0xbb, 0xc8, 0x5d, 0x0f, 0xf5, 0x8d, 0xf4, 0x0b, 0x2d, 0x1c, + 0xe6, 0x64, 0x05, 0x7c, 0xc5, 0x64, 0xa9, 0x8f, 0x97, 0xcc, 0xc5, 0x3d, 0x0d, 0x87, 0x39, 0x79, + 0x13, 0x22, 0xfc, 0x06, 0xb3, 0x89, 0xe2, 0xc6, 0x7a, 0xcf, 0xe4, 0x0d, 0x5a, 0x91, 0x55, 0x28, + 0xf1, 0x54, 0x36, 0x2c, 0x33, 0xfd, 0xeb, 0x6f, 0x78, 0x83, 0x65, 0x0a, 0xad, 0x68, 0x98, 0x93, + 0xdb, 0x10, 0xb1, 0xa6, 0x48, 0x4f, 0x50, 0xc8, 0x82, 0xd7, 0x71, 0xb0, 0xe1, 0x0d, 0x2e, 0x6d, + 0x5d, 0xdd, 0x6c, 0x17, 0xc7, 0xbd, 0xbd, 0xe1, 0x33, 0x7b, 0x44, 0x81, 0x35, 0x85, 0xfb, 0x4e, + 0x3e, 0x80, 0xd7, 0x6c, 0xe2, 0x28, 0xb2, 0xfc, 0x91, 0x9e, 0x4f, 0x5d, 0xd3, 0x8c, 0xe7, 0x68, + 0xb2, 0xb6, 0x44, 0xcd, 0x37, 0xb9, 0x0c, 0x9d, 0xb1, 0x1c, 0xb9, 0x32, 0xeb, 0xcf, 0xe4, 0x0f, + 0x0f, 0xe2, 0x47, 0x52, 0xb1, 0xc3, 0xaa, 0x90, 0x47, 0x67, 0xb9, 0xb7, 0x26, 0x3e, 0x86, 0xbe, + 0x99, 0xf5, 0x54, 0xe0, 0xa8, 0x70, 0x53, 0x1c, 0x6d, 0xad, 0xcd, 0x94, 0xd3, 0xe8, 0x52, 0xa3, + 0xb1, 0xb3, 0x40, 0x23, 0x3c, 0x83, 0x67, 0x06, 0xf4, 0x04, 0x62, 0xee, 0xd6, 0xd3, 0x5c, 0x03, + 0xbb, 0x46, 0x63, 0x6a, 0xc0, 0x42, 0xf2, 0x21, 0x58, 0x98, 0x72, 0x5d, 0xd7, 0x38, 0x33, 0xfc, + 0xd5, 0x79, 0xfc, 0xa7, 0x5a, 0x61, 0x67, 0x81, 0x02, 0x4e, 0xd1, 0xfd, 0x00, 0x7a, 0x06, 0xc9, + 0xe4, 0x2e, 0x44, 0xe7, 0xdc, 0x6c, 0xf3, 0xe0, 0x4d, 0xf3, 0x40, 0x6e, 0x02, 0xd8, 0x20, 0xd3, + 0x22, 0xd7, 0x1d, 0xd3, 0x19, 0x74, 0x69, 0x68, 0x25, 0xc3, 0x5c, 0x26, 0x9f, 0x3a, 0xbe, 0x73, + 0xeb, 0x65, 0xfe, 0xbb, 0xd0, 0x9b, 0xc6, 0xd8, 0x19, 0x44, 0x5b, 0x57, 0xa6, 0x15, 0xd3, 0x94, + 0x61, 0xfd, 0x9c, 0x53, 0xa7, 0x90, 0x6c, 0x01, 0x9c, 0x79, 0xfc, 0x2f, 0xcb, 0xf4, 0xd3, 0x22, + 0xac, 0xcd, 0x29, 0x53, 0xbb, 0x75, 0x6e, 0x41, 0x77, 0x8c, 0x8a, 0xfd, 0xed, 0xbc, 0xb5, 0x23, + 0x45, 0x8d, 0x2a, 0x89, 0xc1, 0x67, 0x79, 0x2e, 0xf4, 0x53, 0x63, 0xef, 0x69, 0xa1, 0x9e, 0x0f, + 0x55, 0x8c, 0x91, 0x4f, 0x54, 0x2a, 0xcd, 0x7c, 0x74, 0x68, 0xe0, 0x04, 0xfb, 0xe4, 0x16, 0xf8, + 0x36, 0x2b, 0x32, 0xee, 0x9a, 0x40, 0x57, 0x36, 0xcf, 0x3f, 0x73, 0x36, 0xbf, 0x26, 0xdc, 0x56, + 0x4f, 0xa7, 0x56, 0x66, 0x47, 0x38, 0x66, 0xba, 0xa9, 0xdd, 0xbc, 0x84, 0x56, 0xf2, 0x0c, 0x05, + 0xb9, 0x0b, 0xcb, 0x3a, 0x2e, 0x4c, 0x5b, 0xbb, 0x3d, 0x63, 0x77, 0xf5, 0x82, 0xdd, 0x03, 0xad, + 0x61, 0x8d, 0x4b, 0xda, 0x57, 0xe7, 0x10, 0x79, 0x0b, 0xfa, 0x58, 0xeb, 0xb4, 0xe5, 0x69, 0x53, + 0xb1, 0xda, 0x8c, 0x54, 0x9f, 0x46, 0x4e, 0xb6, 0x57, 0xb1, 0x3a, 0xf9, 0xc5, 0x83, 0x1b, 0x73, + 0xb3, 0xe7, 0x76, 0xd6, 0x47, 0xee, 0x4d, 0x73, 0xf9, 0x7b, 0x67, 0xb6, 0xbf, 0xfe, 0x62, 0x3e, + 0xa8, 0x65, 0xd9, 0x1d, 0x75, 0xe1, 0x41, 0xf2, 0xa5, 0x7b, 0x8c, 0xee, 0x42, 0x24, 0x6b, 0xd6, + 0xc8, 0x23, 0xae, 0xda, 0x5d, 0xf2, 0x8f, 0xf5, 0x81, 0x96, 0x31, 0xcc, 0xf5, 0xc2, 0x36, 0xc1, + 0xca, 0x78, 0x69, 0xa3, 0x33, 0xe8, 0x53, 0x87, 0x92, 0x5d, 0x58, 0x79, 0xc0, 0xea, 0x0c, 0xab, + 0xff, 0xa3, 0x17, 0x92, 0x35, 0x88, 0x5f, 0xb6, 0x66, 0x73, 0x93, 0x7c, 0xef, 0xc1, 0xca, 0x63, + 0x54, 0x99, 0x0b, 0x7e, 0x8f, 0x8d, 0x50, 0xb6, 0x57, 0xcd, 0x44, 0xe7, 0xbd, 0x6a, 0x74, 0xab, + 0x10, 0xd8, 0xd2, 0x17, 0x76, 0x35, 0x74, 0xa8, 0x6f, 0xf0, 0x30, 0x37, 0x4d, 0x83, 0xa3, 0x31, + 0xd6, 0xea, 0x2c, 0xab, 0xa1, 0x93, 0x58, 0x66, 0xc3, 0x46, 0x68, 0x86, 0xb5, 0x6b, 0x86, 0xd5, + 0xd7, 0x58, 0x8f, 0xea, 0xb7, 0x1e, 0x44, 0xc6, 0xcb, 0x3d, 0x66, 0xde, 0xb6, 0xdb, 0x17, 0x8b, + 0xbb, 0x3e, 0xd7, 0xbd, 0xe9, 0xda, 0x6c, 0x6b, 0x7a, 0x0d, 0x96, 0xb4, 0x41, 0xbb, 0x0a, 0xfa, + 0xd4, 0x02, 0x5d, 0x8e, 0xec, 0x68, 0x52, 0x97, 0x7a, 0x2e, 0x4c, 0x39, 0x2c, 0x22, 0x6f, 0x40, + 0x28, 0x27, 0xe3, 0x31, 0x13, 0x05, 0x5a, 0x7f, 0xfa, 0xf4, 0x4c, 0x70, 0x3f, 0xf9, 0xf9, 0xc5, + 0xba, 0xf7, 0xeb, 0x8b, 0x75, 0xef, 0xb7, 0x17, 0xeb, 0xde, 0x77, 0xbf, 0xaf, 0x2f, 0xc0, 0x65, + 0x2e, 0x46, 0x9b, 0xaa, 0x28, 0x4f, 0x36, 0xcb, 0x13, 0xf3, 0x57, 0xf0, 0xb0, 0x67, 0x7e, 0xb6, + 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x93, 0x0b, 0x62, 0x47, 0x59, 0x0a, 0x00, 0x00, } func (m *S3LockResult) Marshal() (dAtA []byte, err error) { @@ -2037,6 +2045,11 @@ func (m *DisaggTaskMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.GatherId != 0 { + i = encodeVarintDisaggregated(dAtA, i, uint64(m.GatherId)) + i-- + dAtA[i] = 0x48 + } if m.ApiVersion != 0 { i = encodeVarintDisaggregated(dAtA, i, uint64(m.ApiVersion)) i-- @@ -2971,6 +2984,9 @@ func (m *DisaggTaskMeta) Size() (n int) { if m.ApiVersion != 0 { n += 1 + sovDisaggregated(uint64(m.ApiVersion)) } + if m.GatherId != 0 { + n += 1 + sovDisaggregated(uint64(m.GatherId)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4481,6 +4497,25 @@ func (m *DisaggTaskMeta) Unmarshal(dAtA []byte) error { break } } + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field GatherId", wireType) + } + m.GatherId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDisaggregated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.GatherId |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipDisaggregated(dAtA[iNdEx:]) diff --git a/proto/disaggregated.proto b/proto/disaggregated.proto index 78158aadf..b6b429b8e 100644 --- a/proto/disaggregated.proto +++ b/proto/disaggregated.proto @@ -65,7 +65,8 @@ message GetDisaggConfigResponse { message DisaggTaskMeta { uint64 start_ts = 1; // start ts of a query - // query_ts + server_id + local_query_id to represent a global unique query. + // gather_id + query_ts + server_id + local_query_id to represent a global unique query. + int64 gather_id = 9; // used to distinguish different gathers in the mpp query uint64 query_ts = 2; // timestamp when start to execute query, used for TiFlash miniTSO schedule. uint64 server_id = 3; // TiDB server id uint64 local_query_id = 4; // unique local query_id if tidb don't restart. diff --git a/proto/mpp.proto b/proto/mpp.proto index 642f4e81a..c62a6c574 100644 --- a/proto/mpp.proto +++ b/proto/mpp.proto @@ -20,7 +20,7 @@ message TaskMeta { string address = 4; // target address of this task. uint64 gather_id = 5; // used to distinguish different gathers in the mpp query. uint64 query_ts = 6; // timestamp when start to execute query, used for TiFlash miniTSO schedule. - uint64 local_query_id = 7; // unique local query_id if tidb don't restart. So we can use query_ts + local_query_id + server_id to represent a global unique query. + uint64 local_query_id = 7; // unique local query_id if tidb don't restart. So we can use gather_id + query_ts + local_query_id + server_id to represent a global unique query. uint64 server_id = 8; // TiDB server id int64 mpp_version = 9; // mpp version uint32 keyspace_id = 10; // keyspace id of the request diff --git a/scripts/proto.lock b/scripts/proto.lock index 71a27149b..de6f58b6e 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -4229,6 +4229,11 @@ "name": "start_ts", "type": "uint64" }, + { + "id": 9, + "name": "gather_id", + "type": "int64" + }, { "id": 2, "name": "query_ts",