diff --git a/internal/dataservice/mock_test.go b/internal/dataservice/mock_test.go index 4d7d8b72ab..77a6a0177b 100644 --- a/internal/dataservice/mock_test.go +++ b/internal/dataservice/mock_test.go @@ -24,6 +24,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/masterpb" "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/schemapb" ) @@ -291,6 +292,10 @@ func (m *mockMasterService) UpdateChannelTimeTick(ctx context.Context, req *inte panic("not implemented") // TODO: Implement } +func (m *mockMasterService) ReleaseDQLMessageStream(ctx context.Context, req *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + panic("not implemented") // TODO: Implement +} + type mockStartupPolicy struct { } diff --git a/internal/distributed/masterservice/client/client.go b/internal/distributed/masterservice/client/client.go index 2e55ae44ad..846904d01e 100644 --- a/internal/distributed/masterservice/client/client.go +++ b/internal/distributed/masterservice/client/client.go @@ -23,6 +23,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/masterpb" "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/trace" @@ -341,3 +342,9 @@ func (c *GrpcClient) ShowSegments(ctx context.Context, in *milvuspb.ShowSegments }) return ret.(*milvuspb.ShowSegmentsResponse), err } +func (c *GrpcClient) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + ret, err := c.recall(func() (interface{}, error) { + return c.grpcClient.ReleaseDQLMessageStream(ctx, in) + }) + return ret.(*commonpb.Status), err +} diff --git a/internal/distributed/masterservice/service.go b/internal/distributed/masterservice/service.go index 0d4feeea16..cd4caa8ad5 100644 --- a/internal/distributed/masterservice/service.go +++ b/internal/distributed/masterservice/service.go @@ -38,6 +38,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/masterpb" "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/sessionutil" ) @@ -366,3 +367,6 @@ func (s *Server) DescribeSegment(ctx context.Context, in *milvuspb.DescribeSegme func (s *Server) ShowSegments(ctx context.Context, in *milvuspb.ShowSegmentsRequest) (*milvuspb.ShowSegmentsResponse, error) { return s.rootCoord.ShowSegments(ctx, in) } +func (s *Server) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + return s.rootCoord.ReleaseDQLMessageStream(ctx, in) +} diff --git a/internal/distributed/proxynode/client/client.go b/internal/distributed/proxynode/client/client.go index da79f24a06..7861f12e33 100644 --- a/internal/distributed/proxynode/client/client.go +++ b/internal/distributed/proxynode/client/client.go @@ -135,3 +135,6 @@ func (c *Client) InvalidateCollectionMetaCache(ctx context.Context, req *proxypb }) return ret.(*commonpb.Status), err } +func (c *Client) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + panic("not implemented") // TODO: Implement +} diff --git a/internal/distributed/proxynode/service.go b/internal/distributed/proxynode/service.go index 1b5a624101..226cc388e2 100644 --- a/internal/distributed/proxynode/service.go +++ b/internal/distributed/proxynode/service.go @@ -274,6 +274,10 @@ func (s *Server) InvalidateCollectionMetaCache(ctx context.Context, request *pro return s.proxynode.InvalidateCollectionMetaCache(ctx, request) } +func (s *Server) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + panic("not implement") +} + func (s *Server) CreateCollection(ctx context.Context, request *milvuspb.CreateCollectionRequest) (*commonpb.Status, error) { return s.proxynode.CreateCollection(ctx, request) } diff --git a/internal/masterservice/proxy_client_manager.go b/internal/masterservice/proxy_client_manager.go index 0a66799387..27adce79fe 100644 --- a/internal/masterservice/proxy_client_manager.go +++ b/internal/masterservice/proxy_client_manager.go @@ -111,3 +111,39 @@ func (p *proxyClientManager) InvalidateCollectionMetaCache(ctx context.Context, } } + +func (p *proxyClientManager) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + p.lock.Lock() + defer p.lock.Unlock() + + if len(p.proxyClient) == 0 { + log.Debug("proxy client is empty,ReleaseDQLMessageStream will not send to any client") + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_Success, + }, nil + } + for k, f := range p.proxyClient { + sta, err := func() (retSta *commonpb.Status, retErr error) { + defer func() { + if err := recover(); err != nil { + log.Debug("call proxy node ReleaseDQLMessageStream panic", zap.Int64("proxy node id", k), zap.Any("error", err)) + retSta.ErrorCode = commonpb.ErrorCode_UnexpectedError + retSta.Reason = fmt.Sprintf("call proxy node ReleaseDQLMessageStream panic, proxy node id =%d, error = %v", k, err) + retErr = nil + } + }() + retSta, retErr = f.ReleaseDQLMessageStream(ctx, in) + return + }() + if err != nil { + return sta, err + } + if sta.ErrorCode != commonpb.ErrorCode_Success { + return sta, err + } + + } + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_Success, + }, nil +} diff --git a/internal/masterservice/root_coord.go b/internal/masterservice/root_coord.go index fb10d96732..9e04bd1501 100644 --- a/internal/masterservice/root_coord.go +++ b/internal/masterservice/root_coord.go @@ -1885,3 +1885,14 @@ func (c *Core) UpdateChannelTimeTick(ctx context.Context, in *internalpb.Channel Reason: "", }, nil } + +func (c *Core) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + code := c.stateCode.Load().(internalpb.StateCode) + if code != internalpb.StateCode_Healthy { + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UnexpectedError, + Reason: fmt.Sprintf("state code = %s", internalpb.StateCode_name[int32(code)]), + }, nil + } + return c.proxyClientManager.ReleaseDQLMessageStream(ctx, in) +} diff --git a/internal/proto/master.proto b/internal/proto/master.proto index fa6827d5f1..69742879e4 100644 --- a/internal/proto/master.proto +++ b/internal/proto/master.proto @@ -6,6 +6,7 @@ option go_package="github.com/milvus-io/milvus/internal/proto/masterpb"; import "common.proto"; import "milvus.proto"; import "internal.proto"; +import "proxy_service.proto"; service MasterService { rpc GetComponentStates(internal.GetComponentStatesRequest) returns (internal.ComponentStates) {} @@ -94,6 +95,7 @@ service MasterService { rpc AllocTimestamp(AllocTimestampRequest) returns (AllocTimestampResponse) {} rpc AllocID(AllocIDRequest) returns (AllocIDResponse) {} rpc UpdateChannelTimeTick(internal.ChannelTimeTickMsg) returns (common.Status) {} + rpc ReleaseDQLMessageStream(proxy.ReleaseDQLMessageStreamRequest) returns (common.Status) {} } message AllocTimestampRequest { diff --git a/internal/proto/masterpb/master.pb.go b/internal/proto/masterpb/master.pb.go index 2d43633087..306075c0a9 100644 --- a/internal/proto/masterpb/master.pb.go +++ b/internal/proto/masterpb/master.pb.go @@ -10,6 +10,7 @@ import ( commonpb "github.com/milvus-io/milvus/internal/proto/commonpb" internalpb "github.com/milvus-io/milvus/internal/proto/internalpb" milvuspb "github.com/milvus-io/milvus/internal/proto/milvuspb" + proxypb "github.com/milvus-io/milvus/internal/proto/proxypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -241,51 +242,53 @@ func init() { func init() { proto.RegisterFile("master.proto", fileDescriptor_f9c348dec43a6705) } var fileDescriptor_f9c348dec43a6705 = []byte{ - // 694 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x5d, 0x4f, 0xdb, 0x3e, - 0x14, 0xc6, 0x69, 0xe1, 0xcf, 0x5f, 0x1c, 0xda, 0x82, 0x3c, 0x98, 0x50, 0xc7, 0x05, 0x2b, 0x7b, - 0x69, 0x81, 0xb5, 0x08, 0xb4, 0x0f, 0x30, 0x5a, 0x09, 0x7a, 0x81, 0xb4, 0xb5, 0x30, 0xed, 0x45, - 0x08, 0xb9, 0xc1, 0x6a, 0x2d, 0x12, 0x3b, 0xc4, 0x2e, 0xec, 0x76, 0xd2, 0x3e, 0xf8, 0x94, 0x38, - 0x76, 0x93, 0xe6, 0x65, 0xa9, 0xb6, 0xbb, 0xba, 0xf9, 0xf9, 0x79, 0x7c, 0xce, 0x73, 0x24, 0x1b, - 0x2a, 0x0e, 0x16, 0x92, 0x78, 0x6d, 0xd7, 0xe3, 0x92, 0xa3, 0x67, 0x0e, 0xb5, 0x1f, 0xa7, 0x42, - 0xad, 0xda, 0xea, 0x53, 0xbd, 0x62, 0x71, 0xc7, 0xe1, 0x4c, 0xfd, 0x59, 0xaf, 0x44, 0x91, 0x7a, - 0x8d, 0x32, 0x49, 0x3c, 0x86, 0x6d, 0xb5, 0x6e, 0xdc, 0xc2, 0xf6, 0x07, 0xdb, 0xe6, 0xd6, 0x15, - 0x75, 0x88, 0x90, 0xd8, 0x71, 0x07, 0xe4, 0x61, 0x4a, 0x84, 0x44, 0xc7, 0xb0, 0x32, 0xc2, 0x82, - 0xec, 0x94, 0xf6, 0x4a, 0xcd, 0xf5, 0x93, 0xdd, 0x76, 0xcc, 0x28, 0x34, 0xb8, 0x14, 0xe3, 0x33, - 0x2c, 0xc8, 0x20, 0x20, 0xd1, 0x16, 0xfc, 0x67, 0xf1, 0x29, 0x93, 0x3b, 0xcb, 0x7b, 0xa5, 0x66, - 0x75, 0xa0, 0x16, 0x8d, 0x9f, 0x25, 0x78, 0x3e, 0xef, 0x20, 0x5c, 0xce, 0x04, 0x41, 0xa7, 0xb0, - 0x2a, 0x24, 0x96, 0x53, 0x11, 0x9a, 0xbc, 0x48, 0x35, 0x19, 0x06, 0xc8, 0x20, 0x44, 0xd1, 0x2e, - 0xac, 0x49, 0xad, 0xb4, 0x53, 0xde, 0x2b, 0x35, 0x57, 0x06, 0xb3, 0x3f, 0x32, 0xce, 0xf0, 0x05, - 0x6a, 0xc1, 0x11, 0xfa, 0xbd, 0x7f, 0x50, 0x5d, 0x39, 0xaa, 0x6c, 0xc3, 0x86, 0x51, 0xfe, 0x9b, - 0xaa, 0x6a, 0x50, 0xee, 0xf7, 0x02, 0xe9, 0xe5, 0x41, 0xb9, 0xdf, 0x4b, 0xaf, 0xe3, 0xe4, 0xd7, - 0x26, 0x54, 0x2f, 0x83, 0x8c, 0x87, 0xc4, 0x7b, 0xa4, 0x16, 0x41, 0x2e, 0xa0, 0x73, 0x22, 0xbb, - 0xdc, 0x71, 0x39, 0x23, 0x4c, 0xfa, 0xaa, 0x44, 0xa0, 0xe3, 0xb8, 0xa5, 0x89, 0x3c, 0x89, 0x86, - 0xfd, 0xa8, 0xbf, 0xc9, 0xd8, 0x31, 0x87, 0x37, 0x96, 0x90, 0x13, 0x38, 0xfa, 0x61, 0x5e, 0x51, - 0xeb, 0xbe, 0x3b, 0xc1, 0x8c, 0x11, 0x3b, 0xcf, 0x71, 0x0e, 0xd5, 0x8e, 0xfb, 0xf1, 0x1d, 0xe1, - 0x62, 0x28, 0x3d, 0xca, 0xc6, 0xba, 0x97, 0x8d, 0x25, 0xf4, 0x00, 0x5b, 0xe7, 0x24, 0x70, 0xa7, - 0x42, 0x52, 0x4b, 0x68, 0xc3, 0x93, 0x6c, 0xc3, 0x04, 0xbc, 0xa0, 0xe5, 0x2d, 0x6c, 0x76, 0x3d, - 0x82, 0x25, 0xe9, 0x72, 0xdb, 0x26, 0x96, 0xa4, 0x9c, 0xa1, 0xa3, 0xd4, 0xad, 0xf3, 0x98, 0x36, - 0xca, 0x8b, 0xbc, 0xb1, 0x84, 0xbe, 0x43, 0xad, 0xe7, 0x71, 0x37, 0x22, 0x7f, 0x90, 0x2a, 0x1f, - 0x87, 0x0a, 0x8a, 0xdf, 0x42, 0xf5, 0x02, 0x8b, 0x88, 0x76, 0x2b, 0x55, 0x3b, 0xc6, 0x68, 0xe9, - 0x97, 0xa9, 0xe8, 0x19, 0xe7, 0x76, 0xa4, 0x3d, 0x4f, 0x80, 0x7a, 0x44, 0x58, 0x1e, 0x1d, 0x45, - 0x1b, 0xd4, 0x4e, 0xaf, 0x20, 0x01, 0x6a, 0xab, 0x4e, 0x61, 0xde, 0x18, 0x33, 0xd8, 0x18, 0x4e, - 0xf8, 0xd3, 0xec, 0x9b, 0x40, 0x87, 0xe9, 0x89, 0xc6, 0x29, 0x6d, 0x79, 0x54, 0x0c, 0x36, 0x7e, - 0x37, 0xb0, 0xa1, 0x02, 0xfe, 0x88, 0x3d, 0x49, 0x83, 0x2a, 0x0f, 0x73, 0xc6, 0xc0, 0x50, 0x05, - 0x83, 0xfa, 0x0a, 0x55, 0x3f, 0xe0, 0x99, 0x78, 0x2b, 0x73, 0x08, 0x16, 0x95, 0xbe, 0x81, 0xca, - 0x05, 0x16, 0x33, 0xe5, 0x66, 0xd6, 0x08, 0x24, 0x84, 0x0b, 0x4d, 0xc0, 0x3d, 0xd4, 0xfc, 0xae, - 0x99, 0xcd, 0x22, 0x63, 0x7e, 0xe3, 0x90, 0xb6, 0x38, 0x2c, 0xc4, 0x46, 0x53, 0xd7, 0x53, 0x31, - 0x24, 0x63, 0x87, 0x30, 0x99, 0x91, 0xc2, 0x1c, 0x95, 0x9f, 0x7a, 0x02, 0x36, 0x7e, 0x04, 0x2a, - 0xfe, 0x59, 0xc2, 0x0f, 0x22, 0xa3, 0x77, 0x51, 0x44, 0x3b, 0xb5, 0x0a, 0x90, 0xc6, 0xe6, 0x1a, - 0xd6, 0xd5, 0xd8, 0xf4, 0xd9, 0x1d, 0xf9, 0x81, 0xde, 0xe6, 0x0c, 0x56, 0x40, 0x14, 0x4c, 0x7e, - 0x02, 0x55, 0x5d, 0x9a, 0x12, 0x6e, 0xe5, 0x96, 0x1f, 0x93, 0x3e, 0x28, 0x82, 0x9a, 0x02, 0x3e, - 0xc1, 0x9a, 0x3f, 0x9a, 0xca, 0xe5, 0x75, 0xe6, 0xe8, 0x2e, 0x72, 0xf8, 0xfb, 0xf0, 0x9a, 0x36, - 0x2f, 0x85, 0xc4, 0x5c, 0xa9, 0xa7, 0x4f, 0xea, 0x83, 0x25, 0x31, 0x57, 0xe9, 0xac, 0x39, 0xff, - 0x67, 0xf8, 0x3f, 0xbc, 0xb9, 0xd1, 0x7e, 0xf6, 0x4e, 0xf3, 0x62, 0xa8, 0xbf, 0xca, 0x87, 0x8c, - 0x2e, 0x86, 0xed, 0x6b, 0xf7, 0xce, 0xbf, 0x16, 0xd4, 0xe5, 0xa3, 0xaf, 0xbf, 0xf9, 0x24, 0x66, - 0x57, 0x6c, 0x9c, 0xbb, 0x14, 0xe3, 0x3f, 0xf4, 0xe9, 0xec, 0xfd, 0xb7, 0xd3, 0x31, 0x95, 0x93, - 0xe9, 0xc8, 0xff, 0xd2, 0x51, 0xe8, 0x3b, 0xca, 0xc3, 0x5f, 0x1d, 0xad, 0xdc, 0x09, 0x76, 0x77, - 0xd4, 0x49, 0xdd, 0xd1, 0x68, 0x35, 0x58, 0x9f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x99, 0x60, - 0x10, 0x62, 0x42, 0x0a, 0x00, 0x00, + // 736 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xed, 0x4e, 0xdb, 0x3c, + 0x14, 0xc7, 0x69, 0xe1, 0xe1, 0x11, 0x87, 0xb6, 0x20, 0x03, 0x1b, 0xea, 0xf8, 0xc0, 0xca, 0x5e, + 0x5a, 0x60, 0x2d, 0x02, 0xed, 0x02, 0x46, 0x2b, 0x41, 0xa5, 0x55, 0x1a, 0x2d, 0x4c, 0x7b, 0x11, + 0xaa, 0xdc, 0x70, 0xd4, 0x46, 0x24, 0x76, 0x88, 0x5d, 0x60, 0x1f, 0x77, 0xcb, 0xbb, 0x82, 0x29, + 0x71, 0x9c, 0x26, 0x6d, 0xd2, 0x05, 0x6d, 0xdf, 0xe2, 0xf8, 0xe7, 0xff, 0xdf, 0xe7, 0x45, 0x3a, + 0x86, 0x82, 0x4d, 0x85, 0x44, 0xb7, 0xee, 0xb8, 0x5c, 0x72, 0xb2, 0x61, 0x9b, 0xd6, 0xfd, 0x58, + 0xa8, 0x55, 0x5d, 0x6d, 0x95, 0x0b, 0x06, 0xb7, 0x6d, 0xce, 0xd4, 0xcf, 0x72, 0x21, 0x8a, 0x94, + 0x4b, 0x26, 0x93, 0xe8, 0x32, 0x6a, 0x05, 0xeb, 0x0d, 0xc7, 0xe5, 0x8f, 0x3f, 0xfa, 0x02, 0xdd, + 0x7b, 0xd3, 0x40, 0xf5, 0xb3, 0xd2, 0x87, 0xad, 0x0f, 0x96, 0xc5, 0x8d, 0x4b, 0xd3, 0x46, 0x21, + 0xa9, 0xed, 0x74, 0xf1, 0x6e, 0x8c, 0x42, 0x92, 0x23, 0x58, 0x1a, 0x50, 0x81, 0xdb, 0xb9, 0xdd, + 0x5c, 0x75, 0xf5, 0x78, 0xa7, 0x1e, 0x73, 0x0f, 0x5c, 0x3b, 0x62, 0x78, 0x4a, 0x05, 0x76, 0x7d, + 0x92, 0x6c, 0xc2, 0x7f, 0x06, 0x1f, 0x33, 0xb9, 0xbd, 0xb8, 0x9b, 0xab, 0x16, 0xbb, 0x6a, 0x51, + 0xf9, 0x99, 0x83, 0x67, 0xd3, 0x0e, 0xc2, 0xe1, 0x4c, 0x20, 0x39, 0x81, 0x65, 0x21, 0xa9, 0x1c, + 0x8b, 0xc0, 0xe4, 0x45, 0xa2, 0x49, 0xcf, 0x47, 0xba, 0x01, 0x4a, 0x76, 0x60, 0x45, 0x6a, 0xa5, + 0xed, 0xfc, 0x6e, 0xae, 0xba, 0xd4, 0x9d, 0xfc, 0x48, 0xb9, 0xc3, 0x17, 0x28, 0xf9, 0x57, 0x68, + 0xb7, 0xfe, 0x41, 0x74, 0xf9, 0xa8, 0xb2, 0x05, 0x6b, 0xa1, 0xf2, 0xdf, 0x44, 0x55, 0x82, 0x7c, + 0xbb, 0xe5, 0x4b, 0x2f, 0x76, 0xf3, 0xed, 0x56, 0x72, 0x1c, 0xc7, 0xbf, 0xd6, 0xa1, 0xd8, 0xf1, + 0x0b, 0xdf, 0x53, 0x45, 0x24, 0x0e, 0x90, 0x33, 0x94, 0x4d, 0x6e, 0x3b, 0x9c, 0x21, 0x93, 0x9e, + 0x2a, 0x0a, 0x72, 0x14, 0xb7, 0x0c, 0xfb, 0x60, 0x16, 0x0d, 0xf2, 0x51, 0x7e, 0x93, 0x72, 0x62, + 0x0a, 0xaf, 0x2c, 0x10, 0xdb, 0x77, 0xf4, 0x8a, 0x79, 0x69, 0x1a, 0xb7, 0xcd, 0x11, 0x65, 0x0c, + 0xad, 0x79, 0x8e, 0x53, 0xa8, 0x76, 0xdc, 0x8b, 0x9f, 0x08, 0x16, 0x3d, 0xe9, 0x9a, 0x6c, 0xa8, + 0x73, 0x59, 0x59, 0x20, 0x77, 0xb0, 0x79, 0x86, 0xbe, 0xbb, 0x29, 0xa4, 0x69, 0x08, 0x6d, 0x78, + 0x9c, 0x6e, 0x38, 0x03, 0x3f, 0xd1, 0xb2, 0x0f, 0xeb, 0x4d, 0x17, 0xa9, 0xc4, 0x26, 0xb7, 0x2c, + 0x34, 0xa4, 0xc9, 0x19, 0x39, 0x4c, 0x3c, 0x3a, 0x8d, 0x69, 0xa3, 0x79, 0x25, 0xaf, 0x2c, 0x90, + 0xef, 0x50, 0x6a, 0xb9, 0xdc, 0x89, 0xc8, 0xef, 0x27, 0xca, 0xc7, 0xa1, 0x8c, 0xe2, 0x7d, 0x28, + 0x9e, 0x53, 0x11, 0xd1, 0xae, 0x25, 0x6a, 0xc7, 0x18, 0x2d, 0xfd, 0x32, 0x11, 0x3d, 0xe5, 0xdc, + 0x8a, 0xa4, 0xe7, 0x01, 0x48, 0x0b, 0x85, 0xe1, 0x9a, 0x83, 0x68, 0x82, 0xea, 0xc9, 0x11, 0xcc, + 0x80, 0xda, 0xaa, 0x91, 0x99, 0x0f, 0x8d, 0x19, 0xac, 0xf5, 0x46, 0xfc, 0x61, 0xb2, 0x27, 0xc8, + 0x41, 0x72, 0x45, 0xe3, 0x94, 0xb6, 0x3c, 0xcc, 0x06, 0x87, 0x7e, 0xd7, 0xb0, 0xa6, 0x0a, 0xfc, + 0x89, 0xba, 0xd2, 0xf4, 0xa3, 0x3c, 0x98, 0xd3, 0x06, 0x21, 0x95, 0xb1, 0x50, 0x5f, 0xa1, 0xe8, + 0x15, 0x78, 0x22, 0x5e, 0x4b, 0x6d, 0x82, 0xa7, 0x4a, 0x5f, 0x43, 0xe1, 0x9c, 0x8a, 0x89, 0x72, + 0x35, 0xad, 0x05, 0x66, 0x84, 0x33, 0x75, 0xc0, 0x2d, 0x94, 0xbc, 0xac, 0x85, 0x87, 0x45, 0x4a, + 0xff, 0xc6, 0x21, 0x6d, 0x71, 0x90, 0x89, 0x8d, 0x56, 0x5d, 0x77, 0x45, 0x0f, 0x87, 0x36, 0x32, + 0x99, 0x52, 0x85, 0x29, 0x6a, 0x7e, 0xd5, 0x67, 0xe0, 0xd0, 0x0f, 0xa1, 0xe0, 0xdd, 0x25, 0xd8, + 0x10, 0x29, 0xb9, 0x8b, 0x22, 0xda, 0xa9, 0x96, 0x81, 0x0c, 0x6d, 0xae, 0x60, 0x55, 0xb5, 0x4d, + 0x9b, 0xdd, 0xe0, 0x23, 0x79, 0x3b, 0xa7, 0xb1, 0x7c, 0x22, 0x63, 0xe5, 0x47, 0x50, 0xd4, 0xa1, + 0x29, 0xe1, 0xda, 0xdc, 0xf0, 0x63, 0xd2, 0xfb, 0x59, 0xd0, 0x30, 0x80, 0x0b, 0x58, 0xf1, 0x5a, + 0x53, 0xb9, 0xbc, 0x4e, 0x6d, 0xdd, 0xa7, 0x5c, 0xfe, 0x36, 0x18, 0xd3, 0xe1, 0x4b, 0x61, 0xa6, + 0xaf, 0xd4, 0x7b, 0x28, 0xf1, 0xc1, 0x32, 0xd3, 0x57, 0xc9, 0x6c, 0x78, 0xff, 0xcf, 0xf0, 0x7f, + 0x30, 0xb9, 0xc9, 0x5e, 0xfa, 0xc9, 0xf0, 0xc5, 0x50, 0x7e, 0x35, 0x1f, 0x0a, 0x75, 0x29, 0x6c, + 0x5d, 0x39, 0x37, 0xde, 0x58, 0x50, 0xc3, 0x47, 0x8f, 0xbf, 0xe9, 0x4a, 0x4c, 0x46, 0x6c, 0x9c, + 0xeb, 0x88, 0xe1, 0x9f, 0xf2, 0x64, 0xc1, 0xf3, 0x2e, 0x5a, 0x48, 0x05, 0xb6, 0x2e, 0x3e, 0x76, + 0x50, 0x08, 0x3a, 0xc4, 0x9e, 0x74, 0x91, 0xda, 0xd3, 0x63, 0xd1, 0x7f, 0xf1, 0xd5, 0x53, 0xe0, + 0x6c, 0x55, 0x39, 0x7d, 0xff, 0xed, 0x64, 0x68, 0xca, 0xd1, 0x78, 0xe0, 0xed, 0x34, 0x14, 0xfa, + 0xce, 0xe4, 0xc1, 0x57, 0x43, 0xc7, 0xd1, 0xf0, 0x4f, 0x37, 0x54, 0x5e, 0x9c, 0xc1, 0x60, 0xd9, + 0x5f, 0x9f, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x91, 0x3a, 0x52, 0xc5, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -366,6 +369,7 @@ type MasterServiceClient interface { AllocTimestamp(ctx context.Context, in *AllocTimestampRequest, opts ...grpc.CallOption) (*AllocTimestampResponse, error) AllocID(ctx context.Context, in *AllocIDRequest, opts ...grpc.CallOption) (*AllocIDResponse, error) UpdateChannelTimeTick(ctx context.Context, in *internalpb.ChannelTimeTickMsg, opts ...grpc.CallOption) (*commonpb.Status, error) + ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest, opts ...grpc.CallOption) (*commonpb.Status, error) } type masterServiceClient struct { @@ -556,6 +560,15 @@ func (c *masterServiceClient) UpdateChannelTimeTick(ctx context.Context, in *int return out, nil } +func (c *masterServiceClient) ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest, opts ...grpc.CallOption) (*commonpb.Status, error) { + out := new(commonpb.Status) + err := c.cc.Invoke(ctx, "/milvus.proto.master.MasterService/ReleaseDQLMessageStream", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // MasterServiceServer is the server API for MasterService service. type MasterServiceServer interface { GetComponentStates(context.Context, *internalpb.GetComponentStatesRequest) (*internalpb.ComponentStates, error) @@ -624,6 +637,7 @@ type MasterServiceServer interface { AllocTimestamp(context.Context, *AllocTimestampRequest) (*AllocTimestampResponse, error) AllocID(context.Context, *AllocIDRequest) (*AllocIDResponse, error) UpdateChannelTimeTick(context.Context, *internalpb.ChannelTimeTickMsg) (*commonpb.Status, error) + ReleaseDQLMessageStream(context.Context, *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) } // UnimplementedMasterServiceServer can be embedded to have forward compatible implementations. @@ -690,6 +704,9 @@ func (*UnimplementedMasterServiceServer) AllocID(ctx context.Context, req *Alloc func (*UnimplementedMasterServiceServer) UpdateChannelTimeTick(ctx context.Context, req *internalpb.ChannelTimeTickMsg) (*commonpb.Status, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateChannelTimeTick not implemented") } +func (*UnimplementedMasterServiceServer) ReleaseDQLMessageStream(ctx context.Context, req *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReleaseDQLMessageStream not implemented") +} func RegisterMasterServiceServer(s *grpc.Server, srv MasterServiceServer) { s.RegisterService(&_MasterService_serviceDesc, srv) @@ -1055,6 +1072,24 @@ func _MasterService_UpdateChannelTimeTick_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _MasterService_ReleaseDQLMessageStream_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(proxypb.ReleaseDQLMessageStreamRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MasterServiceServer).ReleaseDQLMessageStream(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/milvus.proto.master.MasterService/ReleaseDQLMessageStream", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MasterServiceServer).ReleaseDQLMessageStream(ctx, req.(*proxypb.ReleaseDQLMessageStreamRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _MasterService_serviceDesc = grpc.ServiceDesc{ ServiceName: "milvus.proto.master.MasterService", HandlerType: (*MasterServiceServer)(nil), @@ -1139,6 +1174,10 @@ var _MasterService_serviceDesc = grpc.ServiceDesc{ MethodName: "UpdateChannelTimeTick", Handler: _MasterService_UpdateChannelTimeTick_Handler, }, + { + MethodName: "ReleaseDQLMessageStream", + Handler: _MasterService_ReleaseDQLMessageStream_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "master.proto", diff --git a/internal/proto/proxy_service.proto b/internal/proto/proxy_service.proto index 17b2722a52..46a6fc77b6 100644 --- a/internal/proto/proxy_service.proto +++ b/internal/proto/proxy_service.proto @@ -13,6 +13,8 @@ service ProxyNodeService { rpc InvalidateCollectionMetaCache(InvalidateCollMetaCacheRequest) returns (common.Status) {} rpc GetDdChannel(internal.GetDdChannelRequest) returns (milvus.StringResponse) {} + + rpc ReleaseDQLMessageStream(ReleaseDQLMessageStreamRequest) returns (common.Status) {} } message InvalidateCollMetaCacheRequest { @@ -20,3 +22,9 @@ message InvalidateCollMetaCacheRequest { string db_name = 2; string collection_name = 3; } + +message ReleaseDQLMessageStreamRequest { + common.MsgBase base = 1; + int64 dbID = 2; + int64 collectionID = 3; +} diff --git a/internal/proto/proxypb/proxy_service.pb.go b/internal/proto/proxypb/proxy_service.pb.go index 72ecfbcbe1..d394d4ff51 100644 --- a/internal/proto/proxypb/proxy_service.pb.go +++ b/internal/proto/proxypb/proxy_service.pb.go @@ -82,37 +82,97 @@ func (m *InvalidateCollMetaCacheRequest) GetCollectionName() string { return "" } +type ReleaseDQLMessageStreamRequest struct { + Base *commonpb.MsgBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` + DbID int64 `protobuf:"varint,2,opt,name=dbID,proto3" json:"dbID,omitempty"` + CollectionID int64 `protobuf:"varint,3,opt,name=collectionID,proto3" json:"collectionID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ReleaseDQLMessageStreamRequest) Reset() { *m = ReleaseDQLMessageStreamRequest{} } +func (m *ReleaseDQLMessageStreamRequest) String() string { return proto.CompactTextString(m) } +func (*ReleaseDQLMessageStreamRequest) ProtoMessage() {} +func (*ReleaseDQLMessageStreamRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_34ca2fbc94d169de, []int{1} +} + +func (m *ReleaseDQLMessageStreamRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ReleaseDQLMessageStreamRequest.Unmarshal(m, b) +} +func (m *ReleaseDQLMessageStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ReleaseDQLMessageStreamRequest.Marshal(b, m, deterministic) +} +func (m *ReleaseDQLMessageStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReleaseDQLMessageStreamRequest.Merge(m, src) +} +func (m *ReleaseDQLMessageStreamRequest) XXX_Size() int { + return xxx_messageInfo_ReleaseDQLMessageStreamRequest.Size(m) +} +func (m *ReleaseDQLMessageStreamRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ReleaseDQLMessageStreamRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ReleaseDQLMessageStreamRequest proto.InternalMessageInfo + +func (m *ReleaseDQLMessageStreamRequest) GetBase() *commonpb.MsgBase { + if m != nil { + return m.Base + } + return nil +} + +func (m *ReleaseDQLMessageStreamRequest) GetDbID() int64 { + if m != nil { + return m.DbID + } + return 0 +} + +func (m *ReleaseDQLMessageStreamRequest) GetCollectionID() int64 { + if m != nil { + return m.CollectionID + } + return 0 +} + func init() { proto.RegisterType((*InvalidateCollMetaCacheRequest)(nil), "milvus.proto.proxy.InvalidateCollMetaCacheRequest") + proto.RegisterType((*ReleaseDQLMessageStreamRequest)(nil), "milvus.proto.proxy.ReleaseDQLMessageStreamRequest") } func init() { proto.RegisterFile("proxy_service.proto", fileDescriptor_34ca2fbc94d169de) } var fileDescriptor_34ca2fbc94d169de = []byte{ - // 367 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xdf, 0x6a, 0xe2, 0x40, - 0x14, 0xc6, 0xcd, 0xba, 0xb8, 0xec, 0xac, 0xb8, 0xcb, 0xec, 0xc2, 0x4a, 0xfa, 0x07, 0xb1, 0xd0, - 0x4a, 0xa1, 0x89, 0xa4, 0x7d, 0x02, 0x53, 0x90, 0x5e, 0x28, 0x25, 0xde, 0xf5, 0x46, 0x26, 0xc9, - 0x41, 0x07, 0x26, 0x33, 0x31, 0x73, 0x22, 0xed, 0x7b, 0xf4, 0xb9, 0xfa, 0x4c, 0x25, 0x93, 0x68, - 0x1b, 0xad, 0x85, 0xde, 0xe5, 0x0c, 0xbf, 0x93, 0x6f, 0x7e, 0xf3, 0x91, 0xbf, 0x69, 0xa6, 0x1e, - 0x9f, 0xe6, 0x1a, 0xb2, 0x35, 0x8f, 0xc0, 0x49, 0x33, 0x85, 0x8a, 0xd2, 0x84, 0x8b, 0x75, 0xae, - 0xcb, 0xc9, 0x31, 0x84, 0xdd, 0x8e, 0x54, 0x92, 0x28, 0x59, 0x9e, 0xd9, 0x1d, 0x2e, 0x11, 0x32, - 0xc9, 0x44, 0x35, 0xb7, 0xdf, 0x6f, 0xf4, 0x9f, 0x2d, 0x72, 0x7a, 0x27, 0xd7, 0x4c, 0xf0, 0x98, - 0x21, 0xf8, 0x4a, 0x88, 0x09, 0x20, 0xf3, 0x59, 0xb4, 0x84, 0x00, 0x56, 0x39, 0x68, 0xa4, 0x43, - 0xf2, 0x3d, 0x64, 0x1a, 0xba, 0x56, 0xcf, 0x1a, 0xfc, 0xf2, 0x8e, 0x9d, 0x5a, 0x62, 0x15, 0x35, - 0xd1, 0x8b, 0x11, 0xd3, 0x10, 0x18, 0x92, 0xfe, 0x27, 0x3f, 0xe2, 0x70, 0x2e, 0x59, 0x02, 0xdd, - 0x6f, 0x3d, 0x6b, 0xf0, 0x33, 0x68, 0xc5, 0xe1, 0x94, 0x25, 0x40, 0x2f, 0xc8, 0xef, 0x48, 0x09, - 0x01, 0x11, 0x72, 0x25, 0x4b, 0xa0, 0x69, 0x80, 0xce, 0xdb, 0x71, 0x01, 0x7a, 0x2f, 0x4d, 0xf2, - 0xe7, 0xbe, 0x90, 0x99, 0xaa, 0x18, 0x66, 0xa5, 0x31, 0x4d, 0x09, 0x1d, 0x03, 0xfa, 0x2a, 0x49, - 0x95, 0x04, 0x89, 0x33, 0x64, 0x08, 0x9a, 0x0e, 0xeb, 0x17, 0xda, 0xda, 0xee, 0xa3, 0x95, 0x90, - 0x7d, 0x7e, 0x60, 0x63, 0x07, 0xef, 0x37, 0xe8, 0x8a, 0xfc, 0x1b, 0x83, 0x19, 0xb9, 0x46, 0x1e, - 0x69, 0x7f, 0xc9, 0xa4, 0x04, 0x41, 0xbd, 0xc3, 0x99, 0x7b, 0xf0, 0x26, 0xf5, 0xac, 0xbe, 0x53, - 0x0d, 0x33, 0xcc, 0xb8, 0x5c, 0x04, 0xa0, 0x53, 0x25, 0x35, 0xf4, 0x1b, 0x34, 0x23, 0x27, 0xf5, - 0x3e, 0xca, 0x57, 0xd9, 0xb6, 0xb2, 0x9b, 0x6d, 0x2a, 0x77, 0x3e, 0xaf, 0xd0, 0x3e, 0xfa, 0xb0, - 0xb4, 0xe2, 0xaa, 0x79, 0xa1, 0xc9, 0x48, 0x7b, 0x0c, 0x78, 0x1b, 0x6f, 0xf4, 0x2e, 0x0f, 0xeb, - 0x6d, 0xa1, 0xaf, 0x69, 0x8d, 0x6e, 0x1e, 0xbc, 0x05, 0xc7, 0x65, 0x1e, 0x16, 0xe1, 0x6e, 0x49, - 0x5d, 0x71, 0x55, 0x7d, 0xb9, 0x9b, 0x08, 0xd7, 0xfc, 0xc5, 0x35, 0x52, 0x69, 0x18, 0xb6, 0xcc, - 0x78, 0xfd, 0x1a, 0x00, 0x00, 0xff, 0xff, 0x67, 0x1c, 0x59, 0x0b, 0xfb, 0x02, 0x00, 0x00, + // 428 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xd1, 0x8a, 0xd3, 0x40, + 0x14, 0x86, 0x37, 0xb6, 0xac, 0x38, 0x86, 0x55, 0x46, 0x61, 0x97, 0xa8, 0x4b, 0x89, 0xa0, 0x45, + 0x30, 0x29, 0xd1, 0x27, 0x68, 0x02, 0xa5, 0x60, 0x8b, 0x26, 0x77, 0xde, 0x94, 0x49, 0x72, 0x48, + 0x07, 0x26, 0x33, 0x69, 0x66, 0x52, 0xf4, 0x15, 0xbc, 0xf6, 0x71, 0x7c, 0x38, 0xc9, 0x24, 0x6d, + 0x4d, 0xdb, 0x54, 0xf4, 0x6e, 0xce, 0xc9, 0x77, 0xf8, 0xcf, 0x7f, 0xf2, 0xa3, 0x67, 0x45, 0x29, + 0xbe, 0x7d, 0x5f, 0x49, 0x28, 0xb7, 0x34, 0x01, 0xa7, 0x28, 0x85, 0x12, 0x18, 0xe7, 0x94, 0x6d, + 0x2b, 0xd9, 0x54, 0x8e, 0x26, 0x2c, 0x33, 0x11, 0x79, 0x2e, 0x78, 0xd3, 0xb3, 0x6e, 0x28, 0x57, + 0x50, 0x72, 0xc2, 0xda, 0xda, 0xfc, 0x73, 0xc2, 0xfe, 0x69, 0xa0, 0xfb, 0x39, 0xdf, 0x12, 0x46, + 0x53, 0xa2, 0xc0, 0x17, 0x8c, 0x2d, 0x40, 0x11, 0x9f, 0x24, 0x6b, 0x08, 0x61, 0x53, 0x81, 0x54, + 0x78, 0x82, 0x86, 0x31, 0x91, 0x70, 0x67, 0x8c, 0x8c, 0xf1, 0x63, 0xef, 0xa5, 0xd3, 0x51, 0x6c, + 0xa5, 0x16, 0x32, 0x9b, 0x12, 0x09, 0xa1, 0x26, 0xf1, 0x2d, 0x7a, 0x98, 0xc6, 0x2b, 0x4e, 0x72, + 0xb8, 0x7b, 0x30, 0x32, 0xc6, 0x8f, 0xc2, 0xeb, 0x34, 0x5e, 0x92, 0x1c, 0xf0, 0x5b, 0xf4, 0x24, + 0x11, 0x8c, 0x41, 0xa2, 0xa8, 0xe0, 0x0d, 0x30, 0xd0, 0xc0, 0xcd, 0xa1, 0x5d, 0x83, 0xf6, 0x0f, + 0x03, 0xdd, 0x87, 0xc0, 0x80, 0x48, 0x08, 0xbe, 0x7c, 0x5a, 0x80, 0x94, 0x24, 0x83, 0x48, 0x95, + 0x40, 0xf2, 0xff, 0x5f, 0x0b, 0xa3, 0x61, 0x1a, 0xcf, 0x03, 0xbd, 0xd3, 0x20, 0xd4, 0x6f, 0x6c, + 0x23, 0xf3, 0x20, 0x3d, 0x0f, 0xf4, 0x3a, 0x83, 0xb0, 0xd3, 0xf3, 0x7e, 0x0d, 0xd1, 0xd3, 0xcf, + 0xf5, 0x65, 0x97, 0x22, 0x85, 0xa8, 0x39, 0x3f, 0x2e, 0x10, 0x9e, 0x81, 0xf2, 0x45, 0x5e, 0x08, + 0x0e, 0x5c, 0x45, 0x8a, 0x28, 0x90, 0x78, 0xd2, 0x5d, 0x63, 0x7f, 0xfa, 0x53, 0xb4, 0xb5, 0x61, + 0xbd, 0xe9, 0x99, 0x38, 0xc2, 0xed, 0x2b, 0xbc, 0x41, 0xcf, 0x67, 0xa0, 0x4b, 0x2a, 0x15, 0x4d, + 0xa4, 0xbf, 0x26, 0x9c, 0x03, 0xc3, 0x5e, 0xbf, 0xe6, 0x09, 0xbc, 0x53, 0x7d, 0xdd, 0x9d, 0x69, + 0x8b, 0x48, 0x95, 0x94, 0x67, 0x21, 0xc8, 0x42, 0x70, 0x09, 0xf6, 0x15, 0x2e, 0xd1, 0xab, 0x6e, + 0x38, 0x9a, 0x9b, 0xec, 0x23, 0x72, 0xac, 0xad, 0xf3, 0xe7, 0x5c, 0xce, 0x93, 0xf5, 0xe2, 0xec, + 0xaf, 0xaa, 0x57, 0xad, 0x6a, 0x9b, 0x04, 0x99, 0x33, 0x50, 0x41, 0xba, 0xb3, 0xf7, 0xae, 0xdf, + 0xde, 0x1e, 0xfa, 0x47, 0x5b, 0x0c, 0xdd, 0xf6, 0x84, 0xeb, 0xbc, 0xa1, 0xcb, 0x49, 0xfc, 0x8b, + 0xa1, 0xe9, 0xc7, 0xaf, 0x5e, 0x46, 0xd5, 0xba, 0x8a, 0xeb, 0x2f, 0x6e, 0x83, 0xbe, 0xa7, 0xa2, + 0x7d, 0xb9, 0x3b, 0x43, 0xae, 0x9e, 0x76, 0xb5, 0x62, 0x11, 0xc7, 0xd7, 0xba, 0xfc, 0xf0, 0x3b, + 0x00, 0x00, 0xff, 0xff, 0x1b, 0x9a, 0x9b, 0xba, 0xf6, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -131,6 +191,7 @@ type ProxyNodeServiceClient interface { GetStatisticsChannel(ctx context.Context, in *internalpb.GetStatisticsChannelRequest, opts ...grpc.CallOption) (*milvuspb.StringResponse, error) InvalidateCollectionMetaCache(ctx context.Context, in *InvalidateCollMetaCacheRequest, opts ...grpc.CallOption) (*commonpb.Status, error) GetDdChannel(ctx context.Context, in *internalpb.GetDdChannelRequest, opts ...grpc.CallOption) (*milvuspb.StringResponse, error) + ReleaseDQLMessageStream(ctx context.Context, in *ReleaseDQLMessageStreamRequest, opts ...grpc.CallOption) (*commonpb.Status, error) } type proxyNodeServiceClient struct { @@ -177,12 +238,22 @@ func (c *proxyNodeServiceClient) GetDdChannel(ctx context.Context, in *internalp return out, nil } +func (c *proxyNodeServiceClient) ReleaseDQLMessageStream(ctx context.Context, in *ReleaseDQLMessageStreamRequest, opts ...grpc.CallOption) (*commonpb.Status, error) { + out := new(commonpb.Status) + err := c.cc.Invoke(ctx, "/milvus.proto.proxy.ProxyNodeService/ReleaseDQLMessageStream", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ProxyNodeServiceServer is the server API for ProxyNodeService service. type ProxyNodeServiceServer interface { GetComponentStates(context.Context, *internalpb.GetComponentStatesRequest) (*internalpb.ComponentStates, error) GetStatisticsChannel(context.Context, *internalpb.GetStatisticsChannelRequest) (*milvuspb.StringResponse, error) InvalidateCollectionMetaCache(context.Context, *InvalidateCollMetaCacheRequest) (*commonpb.Status, error) GetDdChannel(context.Context, *internalpb.GetDdChannelRequest) (*milvuspb.StringResponse, error) + ReleaseDQLMessageStream(context.Context, *ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) } // UnimplementedProxyNodeServiceServer can be embedded to have forward compatible implementations. @@ -201,6 +272,9 @@ func (*UnimplementedProxyNodeServiceServer) InvalidateCollectionMetaCache(ctx co func (*UnimplementedProxyNodeServiceServer) GetDdChannel(ctx context.Context, req *internalpb.GetDdChannelRequest) (*milvuspb.StringResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetDdChannel not implemented") } +func (*UnimplementedProxyNodeServiceServer) ReleaseDQLMessageStream(ctx context.Context, req *ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReleaseDQLMessageStream not implemented") +} func RegisterProxyNodeServiceServer(s *grpc.Server, srv ProxyNodeServiceServer) { s.RegisterService(&_ProxyNodeService_serviceDesc, srv) @@ -278,6 +352,24 @@ func _ProxyNodeService_GetDdChannel_Handler(srv interface{}, ctx context.Context return interceptor(ctx, in, info, handler) } +func _ProxyNodeService_ReleaseDQLMessageStream_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReleaseDQLMessageStreamRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ProxyNodeServiceServer).ReleaseDQLMessageStream(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/milvus.proto.proxy.ProxyNodeService/ReleaseDQLMessageStream", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ProxyNodeServiceServer).ReleaseDQLMessageStream(ctx, req.(*ReleaseDQLMessageStreamRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ProxyNodeService_serviceDesc = grpc.ServiceDesc{ ServiceName: "milvus.proto.proxy.ProxyNodeService", HandlerType: (*ProxyNodeServiceServer)(nil), @@ -298,6 +390,10 @@ var _ProxyNodeService_serviceDesc = grpc.ServiceDesc{ MethodName: "GetDdChannel", Handler: _ProxyNodeService_GetDdChannel_Handler, }, + { + MethodName: "ReleaseDQLMessageStream", + Handler: _ProxyNodeService_ReleaseDQLMessageStream_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "proxy_service.proto", diff --git a/internal/types/types.go b/internal/types/types.go index 9b7c8fe3db..c45ae36934 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -111,6 +111,7 @@ type MasterService interface { //segment DescribeSegment(ctx context.Context, req *milvuspb.DescribeSegmentRequest) (*milvuspb.DescribeSegmentResponse, error) ShowSegments(ctx context.Context, req *milvuspb.ShowSegmentsRequest) (*milvuspb.ShowSegmentsResponse, error) + ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) } // MasterComponent is used by grpc server of master service @@ -128,6 +129,7 @@ type ProxyNode interface { Component InvalidateCollectionMetaCache(ctx context.Context, request *proxypb.InvalidateCollMetaCacheRequest) (*commonpb.Status, error) + ReleaseDQLMessageStream(ctx context.Context, in *proxypb.ReleaseDQLMessageStreamRequest) (*commonpb.Status, error) //TODO: move to milvus service /*