update queue shub

This commit is contained in:
joy.zhou
2019-08-02 15:49:02 +08:00
parent 6faec50ab2
commit f1b12c9fa8
9 changed files with 196 additions and 230 deletions
+61 -129
View File
@@ -114,6 +114,7 @@ type DeliverMessageRequest struct {
Topic string `protobuf:"bytes,1,opt,name=Topic,proto3" json:"Topic,omitempty"`
Payload []byte `protobuf:"bytes,2,opt,name=Payload,proto3" json:"Payload,omitempty"`
Qos int32 `protobuf:"varint,3,opt,name=Qos,proto3" json:"Qos,omitempty"`
Share bool `protobuf:"varint,4,opt,name=Share,proto3" json:"Share,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -165,51 +166,11 @@ func (m *DeliverMessageRequest) GetQos() int32 {
return 0
}
type QueryShareSubscribeRequest struct {
Topic string `protobuf:"bytes,1,opt,name=Topic,proto3" json:"Topic,omitempty"`
Qos int32 `protobuf:"varint,2,opt,name=Qos,proto3" json:"Qos,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *QueryShareSubscribeRequest) Reset() { *m = QueryShareSubscribeRequest{} }
func (m *QueryShareSubscribeRequest) String() string { return proto.CompactTextString(m) }
func (*QueryShareSubscribeRequest) ProtoMessage() {}
func (*QueryShareSubscribeRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_935f0990d4a84183, []int{3}
}
func (m *QueryShareSubscribeRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_QueryShareSubscribeRequest.Unmarshal(m, b)
}
func (m *QueryShareSubscribeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_QueryShareSubscribeRequest.Marshal(b, m, deterministic)
}
func (m *QueryShareSubscribeRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_QueryShareSubscribeRequest.Merge(m, src)
}
func (m *QueryShareSubscribeRequest) XXX_Size() int {
return xxx_messageInfo_QueryShareSubscribeRequest.Size(m)
}
func (m *QueryShareSubscribeRequest) XXX_DiscardUnknown() {
xxx_messageInfo_QueryShareSubscribeRequest.DiscardUnknown(m)
}
var xxx_messageInfo_QueryShareSubscribeRequest proto.InternalMessageInfo
func (m *QueryShareSubscribeRequest) GetTopic() string {
func (m *DeliverMessageRequest) GetShare() bool {
if m != nil {
return m.Topic
return m.Share
}
return ""
}
func (m *QueryShareSubscribeRequest) GetQos() int32 {
if m != nil {
return m.Qos
}
return 0
return false
}
type Response struct {
@@ -224,7 +185,7 @@ func (m *Response) Reset() { *m = Response{} }
func (m *Response) String() string { return proto.CompactTextString(m) }
func (*Response) ProtoMessage() {}
func (*Response) Descriptor() ([]byte, []int) {
return fileDescriptor_935f0990d4a84183, []int{4}
return fileDescriptor_935f0990d4a84183, []int{3}
}
func (m *Response) XXX_Unmarshal(b []byte) error {
@@ -259,55 +220,63 @@ func (m *Response) GetMessage() string {
return ""
}
type ShareSubscribeResponse struct {
type SubscribeResponse struct {
RetCode int32 `protobuf:"varint,1,opt,name=RetCode,proto3" json:"RetCode,omitempty"`
Message string `protobuf:"bytes,2,opt,name=Message,proto3" json:"Message,omitempty"`
ShareSubCount int32 `protobuf:"varint,3,opt,name=ShareSubCount,proto3" json:"ShareSubCount,omitempty"`
SubCount int32 `protobuf:"varint,3,opt,name=SubCount,proto3" json:"SubCount,omitempty"`
ShareSubCount int32 `protobuf:"varint,4,opt,name=ShareSubCount,proto3" json:"ShareSubCount,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ShareSubscribeResponse) Reset() { *m = ShareSubscribeResponse{} }
func (m *ShareSubscribeResponse) String() string { return proto.CompactTextString(m) }
func (*ShareSubscribeResponse) ProtoMessage() {}
func (*ShareSubscribeResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_935f0990d4a84183, []int{5}
func (m *SubscribeResponse) Reset() { *m = SubscribeResponse{} }
func (m *SubscribeResponse) String() string { return proto.CompactTextString(m) }
func (*SubscribeResponse) ProtoMessage() {}
func (*SubscribeResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_935f0990d4a84183, []int{4}
}
func (m *ShareSubscribeResponse) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ShareSubscribeResponse.Unmarshal(m, b)
func (m *SubscribeResponse) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_SubscribeResponse.Unmarshal(m, b)
}
func (m *ShareSubscribeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ShareSubscribeResponse.Marshal(b, m, deterministic)
func (m *SubscribeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_SubscribeResponse.Marshal(b, m, deterministic)
}
func (m *ShareSubscribeResponse) XXX_Merge(src proto.Message) {
xxx_messageInfo_ShareSubscribeResponse.Merge(m, src)
func (m *SubscribeResponse) XXX_Merge(src proto.Message) {
xxx_messageInfo_SubscribeResponse.Merge(m, src)
}
func (m *ShareSubscribeResponse) XXX_Size() int {
return xxx_messageInfo_ShareSubscribeResponse.Size(m)
func (m *SubscribeResponse) XXX_Size() int {
return xxx_messageInfo_SubscribeResponse.Size(m)
}
func (m *ShareSubscribeResponse) XXX_DiscardUnknown() {
xxx_messageInfo_ShareSubscribeResponse.DiscardUnknown(m)
func (m *SubscribeResponse) XXX_DiscardUnknown() {
xxx_messageInfo_SubscribeResponse.DiscardUnknown(m)
}
var xxx_messageInfo_ShareSubscribeResponse proto.InternalMessageInfo
var xxx_messageInfo_SubscribeResponse proto.InternalMessageInfo
func (m *ShareSubscribeResponse) GetRetCode() int32 {
func (m *SubscribeResponse) GetRetCode() int32 {
if m != nil {
return m.RetCode
}
return 0
}
func (m *ShareSubscribeResponse) GetMessage() string {
func (m *SubscribeResponse) GetMessage() string {
if m != nil {
return m.Message
}
return ""
}
func (m *ShareSubscribeResponse) GetShareSubCount() int32 {
func (m *SubscribeResponse) GetSubCount() int32 {
if m != nil {
return m.SubCount
}
return 0
}
func (m *SubscribeResponse) GetShareSubCount() int32 {
if m != nil {
return m.ShareSubCount
}
@@ -318,35 +287,34 @@ func init() {
proto.RegisterType((*QuerySubscribeRequest)(nil), "QuerySubscribeRequest")
proto.RegisterType((*QueryConnectRequest)(nil), "QueryConnectRequest")
proto.RegisterType((*DeliverMessageRequest)(nil), "DeliverMessageRequest")
proto.RegisterType((*QueryShareSubscribeRequest)(nil), "QueryShareSubscribeRequest")
proto.RegisterType((*Response)(nil), "Response")
proto.RegisterType((*ShareSubscribeResponse)(nil), "ShareSubscribeResponse")
proto.RegisterType((*SubscribeResponse)(nil), "SubscribeResponse")
}
func init() { proto.RegisterFile("hmq.proto", fileDescriptor_935f0990d4a84183) }
var fileDescriptor_935f0990d4a84183 = []byte{
// 312 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4f, 0xc2, 0x30,
0x14, 0xc6, 0x99, 0x04, 0x65, 0x2f, 0x48, 0x4c, 0x05, 0x24, 0xf3, 0x42, 0x1a, 0x0f, 0x9c, 0x9a,
0xa0, 0xe1, 0xaa, 0x87, 0x71, 0xd0, 0x03, 0x89, 0x2b, 0x5e, 0x3c, 0x6e, 0xe3, 0x45, 0x96, 0xcc,
0x75, 0xb4, 0x1d, 0x09, 0xff, 0xbb, 0x07, 0xb3, 0xb1, 0xaa, 0x35, 0x33, 0x26, 0xdc, 0xf6, 0xad,
0xf9, 0xbe, 0xf7, 0xbd, 0xfe, 0x0a, 0xee, 0xe6, 0x7d, 0xcb, 0x72, 0x29, 0xb4, 0xa0, 0x0f, 0x30,
0x0c, 0x0a, 0x94, 0xfb, 0x55, 0x11, 0xa9, 0x58, 0x26, 0x11, 0x72, 0xdc, 0x16, 0xa8, 0x34, 0x19,
0x40, 0xe7, 0x45, 0xe4, 0x49, 0x3c, 0x76, 0x26, 0xce, 0xd4, 0xe5, 0x07, 0x41, 0x2e, 0xa0, 0x1d,
0x08, 0x35, 0x3e, 0x99, 0x38, 0xd3, 0x0e, 0x2f, 0x3f, 0xe9, 0x0c, 0x2e, 0xab, 0x00, 0x5f, 0x64,
0x19, 0xc6, 0xda, 0xd8, 0x3d, 0xe8, 0xfa, 0x69, 0x82, 0x99, 0x7e, 0x5a, 0xd4, 0x09, 0x5f, 0x9a,
0xbe, 0xc2, 0x70, 0x81, 0x69, 0xb2, 0x43, 0xb9, 0x44, 0xa5, 0xc2, 0xb7, 0x7f, 0x66, 0x8e, 0xe1,
0xec, 0x39, 0xdc, 0xa7, 0x22, 0x5c, 0x57, 0x73, 0x7b, 0xdc, 0x48, 0xd3, 0xa6, 0xfd, 0xdd, 0x66,
0x01, 0xde, 0x61, 0x9d, 0x4d, 0x28, 0xf1, 0xe8, 0x9d, 0xee, 0xa1, 0xcb, 0x51, 0xe5, 0x22, 0x53,
0x58, 0x4e, 0xe7, 0xa8, 0x7d, 0xb1, 0xc6, 0xca, 0xd5, 0xe1, 0x46, 0x96, 0x27, 0x75, 0xff, 0xca,
0xeb, 0x72, 0x23, 0xa9, 0x84, 0xd1, 0xef, 0x02, 0xc7, 0xa7, 0x91, 0x1b, 0x38, 0x37, 0x69, 0xbe,
0x28, 0x32, 0x5d, 0xef, 0x6b, 0xff, 0xbc, 0xfd, 0x70, 0x00, 0x1e, 0x97, 0xc1, 0x0a, 0xe5, 0x2e,
0x89, 0x91, 0xcc, 0xa1, 0x6f, 0x73, 0x25, 0x23, 0xd6, 0x08, 0xda, 0x73, 0x99, 0x69, 0x47, 0x5b,
0x64, 0x06, 0xbd, 0x9f, 0x34, 0xc9, 0x80, 0x35, 0xc0, 0xb5, 0x2d, 0x73, 0xe8, 0xdb, 0x34, 0xc9,
0x88, 0x35, 0xe2, 0xb5, 0x6d, 0xcb, 0xfa, 0xdd, 0xd8, 0x17, 0x45, 0xae, 0xd9, 0xdf, 0xfc, 0xbc,
0x2b, 0xd6, 0x7c, 0xad, 0xb4, 0x15, 0x9d, 0x56, 0xcf, 0xf9, 0xee, 0x33, 0x00, 0x00, 0xff, 0xff,
0x82, 0x90, 0x64, 0x25, 0xdb, 0x02, 0x00, 0x00,
// 317 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4e, 0xf2, 0x40,
0x14, 0x85, 0xff, 0xf9, 0x01, 0xa5, 0x37, 0x48, 0x74, 0x04, 0xd2, 0xb0, 0x22, 0x13, 0x17, 0xac,
0x26, 0x41, 0xe3, 0x16, 0x17, 0x65, 0xa1, 0x0b, 0x12, 0x99, 0xfa, 0x02, 0x6d, 0xb9, 0x91, 0x26,
0xd8, 0x29, 0x33, 0x53, 0x12, 0x1e, 0xc1, 0x17, 0xf2, 0xf9, 0x4c, 0x87, 0xb6, 0x69, 0x63, 0x13,
0x13, 0x77, 0xfd, 0xda, 0xb9, 0xe7, 0x9c, 0xde, 0x33, 0xe0, 0xec, 0x3e, 0x0e, 0x3c, 0x55, 0xd2,
0x48, 0xf6, 0x04, 0xe3, 0x4d, 0x86, 0xea, 0xe4, 0x67, 0xa1, 0x8e, 0x54, 0x1c, 0xa2, 0xc0, 0x43,
0x86, 0xda, 0xd0, 0x11, 0xf4, 0xde, 0x64, 0x1a, 0x47, 0x2e, 0x99, 0x91, 0xb9, 0x23, 0xce, 0x40,
0xaf, 0xa1, 0xb3, 0x91, 0xda, 0xfd, 0x3f, 0x23, 0xf3, 0x9e, 0xc8, 0x1f, 0xd9, 0x02, 0x6e, 0xad,
0x80, 0x27, 0x93, 0x04, 0x23, 0x53, 0x8e, 0x4f, 0xa1, 0xef, 0xed, 0x63, 0x4c, 0xcc, 0xcb, 0xaa,
0x50, 0xa8, 0x98, 0x49, 0x18, 0xaf, 0x70, 0x1f, 0x1f, 0x51, 0xad, 0x51, 0xeb, 0xe0, 0xfd, 0x17,
0x4f, 0x17, 0x2e, 0x5f, 0x83, 0xd3, 0x5e, 0x06, 0x5b, 0xeb, 0x3b, 0x10, 0x25, 0x96, 0x69, 0x3a,
0x55, 0x9a, 0x5c, 0xc1, 0xdf, 0x05, 0x0a, 0xdd, 0xee, 0x8c, 0xcc, 0xfb, 0xe2, 0x0c, 0x6c, 0x09,
0x7d, 0x81, 0x3a, 0x95, 0x89, 0xc6, 0x5c, 0x4d, 0xa0, 0xf1, 0xe4, 0x16, 0xad, 0x4b, 0x4f, 0x94,
0x98, 0x7f, 0x29, 0xf2, 0x58, 0x1f, 0x47, 0x94, 0xc8, 0x3e, 0x09, 0xdc, 0xd4, 0x16, 0xf4, 0x77,
0xa5, 0x7c, 0x2d, 0x7e, 0x16, 0x7a, 0x32, 0x4b, 0x4c, 0x11, 0xbb, 0x62, 0x7a, 0x07, 0x57, 0x36,
0x6e, 0x75, 0xa0, 0x6b, 0x0f, 0x34, 0x5f, 0xde, 0x7f, 0x11, 0x80, 0xe7, 0xf5, 0xc6, 0x47, 0x75,
0x8c, 0x23, 0xa4, 0x4b, 0x18, 0x36, 0xfb, 0xa3, 0x13, 0xde, 0x5a, 0xe8, 0x94, 0xf2, 0x1f, 0xbf,
0xc0, 0xfe, 0xd1, 0x05, 0x0c, 0xea, 0xf5, 0xd1, 0x11, 0x6f, 0x69, 0x73, 0xea, 0xf0, 0xda, 0xc8,
0x23, 0x0c, 0x9b, 0xf5, 0xd1, 0x09, 0x6f, 0xed, 0xb3, 0x31, 0x16, 0x5e, 0xd8, 0x0b, 0xf7, 0xf0,
0x1d, 0x00, 0x00, 0xff, 0xff, 0x97, 0x25, 0x6c, 0x83, 0x7d, 0x02, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -361,10 +329,9 @@ const _ = grpc.SupportPackageIsVersion4
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type HMQServiceClient interface {
QuerySubscribe(ctx context.Context, in *QuerySubscribeRequest, opts ...grpc.CallOption) (*Response, error)
QuerySubscribe(ctx context.Context, in *QuerySubscribeRequest, opts ...grpc.CallOption) (*SubscribeResponse, error)
QueryConnect(ctx context.Context, in *QueryConnectRequest, opts ...grpc.CallOption) (*Response, error)
DeliverMessage(ctx context.Context, in *DeliverMessageRequest, opts ...grpc.CallOption) (*Response, error)
QueryShareSubscribe(ctx context.Context, in *QueryShareSubscribeRequest, opts ...grpc.CallOption) (*ShareSubscribeResponse, error)
}
type hMQServiceClient struct {
@@ -375,8 +342,8 @@ func NewHMQServiceClient(cc *grpc.ClientConn) HMQServiceClient {
return &hMQServiceClient{cc}
}
func (c *hMQServiceClient) QuerySubscribe(ctx context.Context, in *QuerySubscribeRequest, opts ...grpc.CallOption) (*Response, error) {
out := new(Response)
func (c *hMQServiceClient) QuerySubscribe(ctx context.Context, in *QuerySubscribeRequest, opts ...grpc.CallOption) (*SubscribeResponse, error) {
out := new(SubscribeResponse)
err := c.cc.Invoke(ctx, "/HMQService/QuerySubscribe", in, out, opts...)
if err != nil {
return nil, err
@@ -402,28 +369,18 @@ func (c *hMQServiceClient) DeliverMessage(ctx context.Context, in *DeliverMessag
return out, nil
}
func (c *hMQServiceClient) QueryShareSubscribe(ctx context.Context, in *QueryShareSubscribeRequest, opts ...grpc.CallOption) (*ShareSubscribeResponse, error) {
out := new(ShareSubscribeResponse)
err := c.cc.Invoke(ctx, "/HMQService/QueryShareSubscribe", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
// HMQServiceServer is the server API for HMQService service.
type HMQServiceServer interface {
QuerySubscribe(context.Context, *QuerySubscribeRequest) (*Response, error)
QuerySubscribe(context.Context, *QuerySubscribeRequest) (*SubscribeResponse, error)
QueryConnect(context.Context, *QueryConnectRequest) (*Response, error)
DeliverMessage(context.Context, *DeliverMessageRequest) (*Response, error)
QueryShareSubscribe(context.Context, *QueryShareSubscribeRequest) (*ShareSubscribeResponse, error)
}
// UnimplementedHMQServiceServer can be embedded to have forward compatible implementations.
type UnimplementedHMQServiceServer struct {
}
func (*UnimplementedHMQServiceServer) QuerySubscribe(ctx context.Context, req *QuerySubscribeRequest) (*Response, error) {
func (*UnimplementedHMQServiceServer) QuerySubscribe(ctx context.Context, req *QuerySubscribeRequest) (*SubscribeResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method QuerySubscribe not implemented")
}
func (*UnimplementedHMQServiceServer) QueryConnect(ctx context.Context, req *QueryConnectRequest) (*Response, error) {
@@ -432,9 +389,6 @@ func (*UnimplementedHMQServiceServer) QueryConnect(ctx context.Context, req *Que
func (*UnimplementedHMQServiceServer) DeliverMessage(ctx context.Context, req *DeliverMessageRequest) (*Response, error) {
return nil, status.Errorf(codes.Unimplemented, "method DeliverMessage not implemented")
}
func (*UnimplementedHMQServiceServer) QueryShareSubscribe(ctx context.Context, req *QueryShareSubscribeRequest) (*ShareSubscribeResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method QueryShareSubscribe not implemented")
}
func RegisterHMQServiceServer(s *grpc.Server, srv HMQServiceServer) {
s.RegisterService(&_HMQService_serviceDesc, srv)
@@ -494,24 +448,6 @@ func _HMQService_DeliverMessage_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
func _HMQService_QueryShareSubscribe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(QueryShareSubscribeRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(HMQServiceServer).QueryShareSubscribe(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/HMQService/QueryShareSubscribe",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(HMQServiceServer).QueryShareSubscribe(ctx, req.(*QueryShareSubscribeRequest))
}
return interceptor(ctx, in, info, handler)
}
var _HMQService_serviceDesc = grpc.ServiceDesc{
ServiceName: "HMQService",
HandlerType: (*HMQServiceServer)(nil),
@@ -528,10 +464,6 @@ var _HMQService_serviceDesc = grpc.ServiceDesc{
MethodName: "DeliverMessage",
Handler: _HMQService_DeliverMessage_Handler,
},
{
MethodName: "QueryShareSubscribe",
Handler: _HMQService_QueryShareSubscribe_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "hmq.proto",
+5 -9
View File
@@ -13,11 +13,7 @@ message DeliverMessageRequest {
string Topic = 1;
bytes Payload = 2;
int32 Qos = 3;
}
message QueryShareSubscribeRequest {
string Topic = 1;
int32 Qos = 2;
bool Share =4;
}
message Response {
@@ -25,16 +21,16 @@ message Response {
string Message = 2;
}
message ShareSubscribeResponse {
message SubscribeResponse {
int32 RetCode = 1;
string Message = 2;
int32 ShareSubCount = 3;
int32 SubCount = 3;
int32 ShareSubCount = 4;
}
//Service define
service HMQService {
rpc QuerySubscribe(QuerySubscribeRequest) returns (Response) {}
rpc QuerySubscribe(QuerySubscribeRequest) returns (SubscribeResponse) {}
rpc QueryConnect(QueryConnectRequest) returns (Response) {}
rpc DeliverMessage(DeliverMessageRequest) returns (Response) {}
rpc QueryShareSubscribe(QueryShareSubscribeRequest) returns (ShareSubscribeResponse) {}
}