From 4ec4f58b0b9e84e759ee83370041cea430f820c5 Mon Sep 17 00:00:00 2001 From: Tyler Treat Date: Tue, 21 Apr 2020 11:50:21 -0600 Subject: [PATCH] Separate Publish and PublishToSubject endpoints --- api.proto | 53 ++- go/api.pb.go | 982 ++++++++++++++++++++++++++++++++++++--------- py/api_pb2.py | 281 ++++++++++--- py/api_pb2_grpc.py | 22 +- 4 files changed, 1080 insertions(+), 258 deletions(-) diff --git a/api.proto b/api.proto index fef25f5..20d14a8 100644 --- a/api.proto +++ b/api.proto @@ -72,25 +72,42 @@ message FetchMetadataResponse { repeated StreamMetadata metadata = 2; // Information for all streams } -// PublishRequest is sent to publish a new message. +// PublishRequest is sent to publish a new message to a stream. message PublishRequest { - bytes key = 1; // Message key - bytes value = 2; // Message payload - string stream = 3; // Stream name to publish to - int32 partition = 4; // Stream partition to publish to - string subject = 5; // NATS subject to publish to - string replySubject = 6; // NATS reply subject - map headers = 7; // Message headers - string ackInbox = 8; // NATS subject to publish acks to - string correlationId = 9; // User-supplied value to correlate acks to publishes - AckPolicy ackPolicy = 10; // Controls the behavior of acks -} - -// PublishResponse is sent by the server after publishing a message. + bytes key = 1; // Message key + bytes value = 2; // Message payload + string stream = 3; // Stream name to publish to + int32 partition = 4; // Stream partition to publish to + map headers = 5; // Message headers + string ackInbox = 6; // NATS subject to publish acks to + string correlationId = 7; // User-supplied value to correlate acks to publishes + AckPolicy ackPolicy = 8; // Controls the behavior of acks +} + +// PublishResponse is sent by the server after publishing a message to a +// stream. message PublishResponse { Ack ack = 1; // The ack for the published message if AckPolicy was not NONE } +// PublishToSubjectRequest is sent to publish a Liftbridge message to a NATS +// subject. +message PublishToSubjectRequest { + bytes key = 1; // Message key + bytes value = 2; // Message payload + string subject = 3; // NATS subject to publish to + map headers = 4; // Message headers + string ackInbox = 5; // NATS subject to publish acks to + string correlationId = 6; // User-supplied value to correlate acks to publishes + AckPolicy ackPolicy = 7; // Controls the behavior of acks +} + +// PublishToSubjectResponse is sent by the server after publishing a message to +// a NATS subject. +message PublishToSubjectResponse { + Ack ack = 1; // The ack for the published message if AckPolicy was not NONE +} + // Broker contains information for a Liftbridge broker. message Broker { string id = 1; // Broker id @@ -220,9 +237,15 @@ service API { // broker information. rpc FetchMetadata(FetchMetadataRequest) returns (FetchMetadataResponse) {} - // Publish a new message to a subject. If the AckPolicy is not NONE and a + // Publish a new message to a stream. If the AckPolicy is not NONE and a // deadline is provided, this will synchronously block until the ack is // received. If the ack is not received in time, a DeadlineExceeded status // code is returned. rpc Publish(PublishRequest) returns (PublishResponse) {} + + // Publish a Liftbridge message to a NATS subject. If the AckPolicy is not NONE and a + // deadline is provided, this will synchronously block until the first ack + // is received. If an ack is not received in time, a DeadlineExceeded + // status code is returned. + rpc PublishToSubject(PublishToSubjectRequest) returns (PublishToSubjectResponse) {} } diff --git a/go/api.pb.go b/go/api.pb.go index bca8b94..e46fc62 100644 --- a/go/api.pb.go +++ b/go/api.pb.go @@ -19,6 +19,8 @@ FetchMetadataResponse PublishRequest PublishResponse + PublishToSubjectRequest + PublishToSubjectResponse Broker StreamMetadata PartitionMetadata @@ -155,7 +157,7 @@ var StreamMetadata_Error_value = map[string]int32{ func (x StreamMetadata_Error) String() string { return proto1.EnumName(StreamMetadata_Error_name, int32(x)) } -func (StreamMetadata_Error) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{12, 0} } +func (StreamMetadata_Error) EnumDescriptor() ([]byte, []int) { return fileDescriptorApi, []int{14, 0} } // CreateStreamRequest is sent to create a new stream. type CreateStreamRequest struct { @@ -385,18 +387,16 @@ func (m *FetchMetadataResponse) GetMetadata() []*StreamMetadata { return nil } -// PublishRequest is sent to publish a new message. +// PublishRequest is sent to publish a new message to a stream. type PublishRequest struct { Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` Stream string `protobuf:"bytes,3,opt,name=stream,proto3" json:"stream,omitempty"` Partition int32 `protobuf:"varint,4,opt,name=partition,proto3" json:"partition,omitempty"` - Subject string `protobuf:"bytes,5,opt,name=subject,proto3" json:"subject,omitempty"` - ReplySubject string `protobuf:"bytes,6,opt,name=replySubject,proto3" json:"replySubject,omitempty"` - Headers map[string][]byte `protobuf:"bytes,7,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - AckInbox string `protobuf:"bytes,8,opt,name=ackInbox,proto3" json:"ackInbox,omitempty"` - CorrelationId string `protobuf:"bytes,9,opt,name=correlationId,proto3" json:"correlationId,omitempty"` - AckPolicy AckPolicy `protobuf:"varint,10,opt,name=ackPolicy,proto3,enum=proto.AckPolicy" json:"ackPolicy,omitempty"` + Headers map[string][]byte `protobuf:"bytes,5,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AckInbox string `protobuf:"bytes,6,opt,name=ackInbox,proto3" json:"ackInbox,omitempty"` + CorrelationId string `protobuf:"bytes,7,opt,name=correlationId,proto3" json:"correlationId,omitempty"` + AckPolicy AckPolicy `protobuf:"varint,8,opt,name=ackPolicy,proto3,enum=proto.AckPolicy" json:"ackPolicy,omitempty"` } func (m *PublishRequest) Reset() { *m = PublishRequest{} } @@ -432,20 +432,6 @@ func (m *PublishRequest) GetPartition() int32 { return 0 } -func (m *PublishRequest) GetSubject() string { - if m != nil { - return m.Subject - } - return "" -} - -func (m *PublishRequest) GetReplySubject() string { - if m != nil { - return m.ReplySubject - } - return "" -} - func (m *PublishRequest) GetHeaders() map[string][]byte { if m != nil { return m.Headers @@ -474,7 +460,8 @@ func (m *PublishRequest) GetAckPolicy() AckPolicy { return AckPolicy_LEADER } -// PublishResponse is sent by the server after publishing a message. +// PublishResponse is sent by the server after publishing a message to a +// stream. type PublishResponse struct { Ack *Ack `protobuf:"bytes,1,opt,name=ack" json:"ack,omitempty"` } @@ -491,6 +478,90 @@ func (m *PublishResponse) GetAck() *Ack { return nil } +// PublishToSubjectRequest is sent to publish a Liftbridge message to a NATS +// subject. +type PublishToSubjectRequest struct { + Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Subject string `protobuf:"bytes,3,opt,name=subject,proto3" json:"subject,omitempty"` + Headers map[string][]byte `protobuf:"bytes,4,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AckInbox string `protobuf:"bytes,5,opt,name=ackInbox,proto3" json:"ackInbox,omitempty"` + CorrelationId string `protobuf:"bytes,6,opt,name=correlationId,proto3" json:"correlationId,omitempty"` + AckPolicy AckPolicy `protobuf:"varint,7,opt,name=ackPolicy,proto3,enum=proto.AckPolicy" json:"ackPolicy,omitempty"` +} + +func (m *PublishToSubjectRequest) Reset() { *m = PublishToSubjectRequest{} } +func (m *PublishToSubjectRequest) String() string { return proto1.CompactTextString(m) } +func (*PublishToSubjectRequest) ProtoMessage() {} +func (*PublishToSubjectRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{11} } + +func (m *PublishToSubjectRequest) GetKey() []byte { + if m != nil { + return m.Key + } + return nil +} + +func (m *PublishToSubjectRequest) GetValue() []byte { + if m != nil { + return m.Value + } + return nil +} + +func (m *PublishToSubjectRequest) GetSubject() string { + if m != nil { + return m.Subject + } + return "" +} + +func (m *PublishToSubjectRequest) GetHeaders() map[string][]byte { + if m != nil { + return m.Headers + } + return nil +} + +func (m *PublishToSubjectRequest) GetAckInbox() string { + if m != nil { + return m.AckInbox + } + return "" +} + +func (m *PublishToSubjectRequest) GetCorrelationId() string { + if m != nil { + return m.CorrelationId + } + return "" +} + +func (m *PublishToSubjectRequest) GetAckPolicy() AckPolicy { + if m != nil { + return m.AckPolicy + } + return AckPolicy_LEADER +} + +// PublishToSubjectResponse is sent by the server after publishing a message to +// a NATS subject. +type PublishToSubjectResponse struct { + Ack *Ack `protobuf:"bytes,1,opt,name=ack" json:"ack,omitempty"` +} + +func (m *PublishToSubjectResponse) Reset() { *m = PublishToSubjectResponse{} } +func (m *PublishToSubjectResponse) String() string { return proto1.CompactTextString(m) } +func (*PublishToSubjectResponse) ProtoMessage() {} +func (*PublishToSubjectResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{12} } + +func (m *PublishToSubjectResponse) GetAck() *Ack { + if m != nil { + return m.Ack + } + return nil +} + // Broker contains information for a Liftbridge broker. type Broker struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -501,7 +572,7 @@ type Broker struct { func (m *Broker) Reset() { *m = Broker{} } func (m *Broker) String() string { return proto1.CompactTextString(m) } func (*Broker) ProtoMessage() {} -func (*Broker) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{11} } +func (*Broker) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{13} } func (m *Broker) GetId() string { if m != nil { @@ -535,7 +606,7 @@ type StreamMetadata struct { func (m *StreamMetadata) Reset() { *m = StreamMetadata{} } func (m *StreamMetadata) String() string { return proto1.CompactTextString(m) } func (*StreamMetadata) ProtoMessage() {} -func (*StreamMetadata) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{12} } +func (*StreamMetadata) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{14} } func (m *StreamMetadata) GetName() string { if m != nil { @@ -576,7 +647,7 @@ type PartitionMetadata struct { func (m *PartitionMetadata) Reset() { *m = PartitionMetadata{} } func (m *PartitionMetadata) String() string { return proto1.CompactTextString(m) } func (*PartitionMetadata) ProtoMessage() {} -func (*PartitionMetadata) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{13} } +func (*PartitionMetadata) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{15} } func (m *PartitionMetadata) GetId() int32 { if m != nil { @@ -625,7 +696,7 @@ type Message struct { func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto1.CompactTextString(m) } func (*Message) ProtoMessage() {} -func (*Message) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{14} } +func (*Message) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{16} } func (m *Message) GetOffset() int64 { if m != nil { @@ -726,7 +797,7 @@ type Ack struct { func (m *Ack) Reset() { *m = Ack{} } func (m *Ack) String() string { return proto1.CompactTextString(m) } func (*Ack) ProtoMessage() {} -func (*Ack) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{15} } +func (*Ack) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{17} } func (m *Ack) GetStream() string { if m != nil { @@ -786,7 +857,7 @@ type CreateStreamOp struct { func (m *CreateStreamOp) Reset() { *m = CreateStreamOp{} } func (m *CreateStreamOp) String() string { return proto1.CompactTextString(m) } func (*CreateStreamOp) ProtoMessage() {} -func (*CreateStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{16} } +func (*CreateStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{18} } func (m *CreateStreamOp) GetStream() string { if m != nil { @@ -810,7 +881,7 @@ type DeleteStreamOp struct { func (m *DeleteStreamOp) Reset() { *m = DeleteStreamOp{} } func (m *DeleteStreamOp) String() string { return proto1.CompactTextString(m) } func (*DeleteStreamOp) ProtoMessage() {} -func (*DeleteStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{17} } +func (*DeleteStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{19} } func (m *DeleteStreamOp) GetStream() string { if m != nil { @@ -829,7 +900,7 @@ type PauseStreamOp struct { func (m *PauseStreamOp) Reset() { *m = PauseStreamOp{} } func (m *PauseStreamOp) String() string { return proto1.CompactTextString(m) } func (*PauseStreamOp) ProtoMessage() {} -func (*PauseStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{18} } +func (*PauseStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{20} } func (m *PauseStreamOp) GetStream() string { if m != nil { @@ -861,7 +932,7 @@ type ResumeStreamOp struct { func (m *ResumeStreamOp) Reset() { *m = ResumeStreamOp{} } func (m *ResumeStreamOp) String() string { return proto1.CompactTextString(m) } func (*ResumeStreamOp) ProtoMessage() {} -func (*ResumeStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{19} } +func (*ResumeStreamOp) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{21} } func (m *ResumeStreamOp) GetStream() string { if m != nil { @@ -890,7 +961,7 @@ type ActivityStreamEvent struct { func (m *ActivityStreamEvent) Reset() { *m = ActivityStreamEvent{} } func (m *ActivityStreamEvent) String() string { return proto1.CompactTextString(m) } func (*ActivityStreamEvent) ProtoMessage() {} -func (*ActivityStreamEvent) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{20} } +func (*ActivityStreamEvent) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{22} } func (m *ActivityStreamEvent) GetId() uint64 { if m != nil { @@ -946,6 +1017,8 @@ func init() { proto1.RegisterType((*FetchMetadataResponse)(nil), "proto.FetchMetadataResponse") proto1.RegisterType((*PublishRequest)(nil), "proto.PublishRequest") proto1.RegisterType((*PublishResponse)(nil), "proto.PublishResponse") + proto1.RegisterType((*PublishToSubjectRequest)(nil), "proto.PublishToSubjectRequest") + proto1.RegisterType((*PublishToSubjectResponse)(nil), "proto.PublishToSubjectResponse") proto1.RegisterType((*Broker)(nil), "proto.Broker") proto1.RegisterType((*StreamMetadata)(nil), "proto.StreamMetadata") proto1.RegisterType((*PartitionMetadata)(nil), "proto.PartitionMetadata") @@ -991,11 +1064,16 @@ type APIClient interface { // FetchMetadata retrieves the latest cluster metadata, including stream // broker information. FetchMetadata(ctx context.Context, in *FetchMetadataRequest, opts ...grpc.CallOption) (*FetchMetadataResponse, error) - // Publish a new message to a subject. If the AckPolicy is not NONE and a + // Publish a new message to a stream. If the AckPolicy is not NONE and a // deadline is provided, this will synchronously block until the ack is // received. If the ack is not received in time, a DeadlineExceeded status // code is returned. Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error) + // Publish a Liftbridge message to a NATS subject. If the AckPolicy is not NONE and a + // deadline is provided, this will synchronously block until the first ack + // is received. If an ack is not received in time, a DeadlineExceeded + // status code is returned. + PublishToSubject(ctx context.Context, in *PublishToSubjectRequest, opts ...grpc.CallOption) (*PublishToSubjectResponse, error) } type aPIClient struct { @@ -1083,6 +1161,15 @@ func (c *aPIClient) Publish(ctx context.Context, in *PublishRequest, opts ...grp return out, nil } +func (c *aPIClient) PublishToSubject(ctx context.Context, in *PublishToSubjectRequest, opts ...grpc.CallOption) (*PublishToSubjectResponse, error) { + out := new(PublishToSubjectResponse) + err := grpc.Invoke(ctx, "/proto.API/PublishToSubject", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for API service type APIServer interface { @@ -1104,11 +1191,16 @@ type APIServer interface { // FetchMetadata retrieves the latest cluster metadata, including stream // broker information. FetchMetadata(context.Context, *FetchMetadataRequest) (*FetchMetadataResponse, error) - // Publish a new message to a subject. If the AckPolicy is not NONE and a + // Publish a new message to a stream. If the AckPolicy is not NONE and a // deadline is provided, this will synchronously block until the ack is // received. If the ack is not received in time, a DeadlineExceeded status // code is returned. Publish(context.Context, *PublishRequest) (*PublishResponse, error) + // Publish a Liftbridge message to a NATS subject. If the AckPolicy is not NONE and a + // deadline is provided, this will synchronously block until the first ack + // is received. If an ack is not received in time, a DeadlineExceeded + // status code is returned. + PublishToSubject(context.Context, *PublishToSubjectRequest) (*PublishToSubjectResponse, error) } func RegisterAPIServer(s *grpc.Server, srv APIServer) { @@ -1226,6 +1318,24 @@ func _API_Publish_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _API_PublishToSubject_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PublishToSubjectRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(APIServer).PublishToSubject(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/proto.API/PublishToSubject", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(APIServer).PublishToSubject(ctx, req.(*PublishToSubjectRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _API_serviceDesc = grpc.ServiceDesc{ ServiceName: "proto.API", HandlerType: (*APIServer)(nil), @@ -1250,6 +1360,10 @@ var _API_serviceDesc = grpc.ServiceDesc{ MethodName: "Publish", Handler: _API_Publish_Handler, }, + { + MethodName: "PublishToSubject", + Handler: _API_PublishToSubject_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -1604,21 +1718,113 @@ func (m *PublishRequest) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintApi(dAtA, i, uint64(m.Partition)) } + if len(m.Headers) > 0 { + for k, _ := range m.Headers { + dAtA[i] = 0x2a + i++ + v := m.Headers[k] + byteSize := 0 + if len(v) > 0 { + byteSize = 1 + len(v) + sovApi(uint64(len(v))) + } + mapSize := 1 + len(k) + sovApi(uint64(len(k))) + byteSize + i = encodeVarintApi(dAtA, i, uint64(mapSize)) + dAtA[i] = 0xa + i++ + i = encodeVarintApi(dAtA, i, uint64(len(k))) + i += copy(dAtA[i:], k) + if len(v) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintApi(dAtA, i, uint64(len(v))) + i += copy(dAtA[i:], v) + } + } + } + if len(m.AckInbox) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintApi(dAtA, i, uint64(len(m.AckInbox))) + i += copy(dAtA[i:], m.AckInbox) + } + if len(m.CorrelationId) > 0 { + dAtA[i] = 0x3a + i++ + i = encodeVarintApi(dAtA, i, uint64(len(m.CorrelationId))) + i += copy(dAtA[i:], m.CorrelationId) + } + if m.AckPolicy != 0 { + dAtA[i] = 0x40 + i++ + i = encodeVarintApi(dAtA, i, uint64(m.AckPolicy)) + } + return i, nil +} + +func (m *PublishResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PublishResponse) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Ack != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintApi(dAtA, i, uint64(m.Ack.Size())) + n3, err := m.Ack.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n3 + } + return i, nil +} + +func (m *PublishToSubjectRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PublishToSubjectRequest) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Key) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintApi(dAtA, i, uint64(len(m.Key))) + i += copy(dAtA[i:], m.Key) + } + if len(m.Value) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintApi(dAtA, i, uint64(len(m.Value))) + i += copy(dAtA[i:], m.Value) + } if len(m.Subject) > 0 { - dAtA[i] = 0x2a + dAtA[i] = 0x1a i++ i = encodeVarintApi(dAtA, i, uint64(len(m.Subject))) i += copy(dAtA[i:], m.Subject) } - if len(m.ReplySubject) > 0 { - dAtA[i] = 0x32 - i++ - i = encodeVarintApi(dAtA, i, uint64(len(m.ReplySubject))) - i += copy(dAtA[i:], m.ReplySubject) - } if len(m.Headers) > 0 { for k, _ := range m.Headers { - dAtA[i] = 0x3a + dAtA[i] = 0x22 i++ v := m.Headers[k] byteSize := 0 @@ -1640,26 +1846,26 @@ func (m *PublishRequest) MarshalTo(dAtA []byte) (int, error) { } } if len(m.AckInbox) > 0 { - dAtA[i] = 0x42 + dAtA[i] = 0x2a i++ i = encodeVarintApi(dAtA, i, uint64(len(m.AckInbox))) i += copy(dAtA[i:], m.AckInbox) } if len(m.CorrelationId) > 0 { - dAtA[i] = 0x4a + dAtA[i] = 0x32 i++ i = encodeVarintApi(dAtA, i, uint64(len(m.CorrelationId))) i += copy(dAtA[i:], m.CorrelationId) } if m.AckPolicy != 0 { - dAtA[i] = 0x50 + dAtA[i] = 0x38 i++ i = encodeVarintApi(dAtA, i, uint64(m.AckPolicy)) } return i, nil } -func (m *PublishResponse) Marshal() (dAtA []byte, err error) { +func (m *PublishToSubjectResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1669,7 +1875,7 @@ func (m *PublishResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PublishResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *PublishToSubjectResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1678,11 +1884,11 @@ func (m *PublishResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintApi(dAtA, i, uint64(m.Ack.Size())) - n3, err := m.Ack.MarshalTo(dAtA[i:]) + n4, err := m.Ack.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n3 + i += n4 } return i, nil } @@ -1773,11 +1979,11 @@ func (m *StreamMetadata) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintApi(dAtA, i, uint64(v.Size())) - n4, err := v.MarshalTo(dAtA[i:]) + n5, err := v.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n4 + i += n5 } } } @@ -2026,22 +2232,22 @@ func (m *CreateStreamOp) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], m.Stream) } if len(m.Partitions) > 0 { - dAtA6 := make([]byte, len(m.Partitions)*10) - var j5 int + dAtA7 := make([]byte, len(m.Partitions)*10) + var j6 int for _, num1 := range m.Partitions { num := uint64(num1) for num >= 1<<7 { - dAtA6[j5] = uint8(uint64(num)&0x7f | 0x80) + dAtA7[j6] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j5++ + j6++ } - dAtA6[j5] = uint8(num) - j5++ + dAtA7[j6] = uint8(num) + j6++ } dAtA[i] = 0x12 i++ - i = encodeVarintApi(dAtA, i, uint64(j5)) - i += copy(dAtA[i:], dAtA6[:j5]) + i = encodeVarintApi(dAtA, i, uint64(j6)) + i += copy(dAtA[i:], dAtA7[:j6]) } return i, nil } @@ -2092,22 +2298,22 @@ func (m *PauseStreamOp) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], m.Stream) } if len(m.Partitions) > 0 { - dAtA8 := make([]byte, len(m.Partitions)*10) - var j7 int + dAtA9 := make([]byte, len(m.Partitions)*10) + var j8 int for _, num1 := range m.Partitions { num := uint64(num1) for num >= 1<<7 { - dAtA8[j7] = uint8(uint64(num)&0x7f | 0x80) + dAtA9[j8] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j7++ + j8++ } - dAtA8[j7] = uint8(num) - j7++ + dAtA9[j8] = uint8(num) + j8++ } dAtA[i] = 0x12 i++ - i = encodeVarintApi(dAtA, i, uint64(j7)) - i += copy(dAtA[i:], dAtA8[:j7]) + i = encodeVarintApi(dAtA, i, uint64(j8)) + i += copy(dAtA[i:], dAtA9[:j8]) } if m.ResumeAll { dAtA[i] = 0x18 @@ -2144,22 +2350,22 @@ func (m *ResumeStreamOp) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], m.Stream) } if len(m.Partitions) > 0 { - dAtA10 := make([]byte, len(m.Partitions)*10) - var j9 int + dAtA11 := make([]byte, len(m.Partitions)*10) + var j10 int for _, num1 := range m.Partitions { num := uint64(num1) for num >= 1<<7 { - dAtA10[j9] = uint8(uint64(num)&0x7f | 0x80) + dAtA11[j10] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j9++ + j10++ } - dAtA10[j9] = uint8(num) - j9++ + dAtA11[j10] = uint8(num) + j10++ } dAtA[i] = 0x12 i++ - i = encodeVarintApi(dAtA, i, uint64(j9)) - i += copy(dAtA[i:], dAtA10[:j9]) + i = encodeVarintApi(dAtA, i, uint64(j10)) + i += copy(dAtA[i:], dAtA11[:j10]) } return i, nil } @@ -2193,41 +2399,41 @@ func (m *ActivityStreamEvent) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintApi(dAtA, i, uint64(m.CreateStreamOp.Size())) - n11, err := m.CreateStreamOp.MarshalTo(dAtA[i:]) + n12, err := m.CreateStreamOp.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n11 + i += n12 } if m.DeleteStreamOp != nil { dAtA[i] = 0x22 i++ i = encodeVarintApi(dAtA, i, uint64(m.DeleteStreamOp.Size())) - n12, err := m.DeleteStreamOp.MarshalTo(dAtA[i:]) + n13, err := m.DeleteStreamOp.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n12 + i += n13 } if m.PauseStreamOp != nil { dAtA[i] = 0x2a i++ i = encodeVarintApi(dAtA, i, uint64(m.PauseStreamOp.Size())) - n13, err := m.PauseStreamOp.MarshalTo(dAtA[i:]) + n14, err := m.PauseStreamOp.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n13 + i += n14 } if m.ResumeStreamOp != nil { dAtA[i] = 0x32 i++ i = encodeVarintApi(dAtA, i, uint64(m.ResumeStreamOp.Size())) - n14, err := m.ResumeStreamOp.MarshalTo(dAtA[i:]) + n15, err := m.ResumeStreamOp.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n14 + i += n15 } return i, nil } @@ -2386,11 +2592,54 @@ func (m *PublishRequest) Size() (n int) { if m.Partition != 0 { n += 1 + sovApi(uint64(m.Partition)) } - l = len(m.Subject) + if len(m.Headers) > 0 { + for k, v := range m.Headers { + _ = k + _ = v + l = 0 + if len(v) > 0 { + l = 1 + len(v) + sovApi(uint64(len(v))) + } + mapEntrySize := 1 + len(k) + sovApi(uint64(len(k))) + l + n += mapEntrySize + 1 + sovApi(uint64(mapEntrySize)) + } + } + l = len(m.AckInbox) if l > 0 { n += 1 + l + sovApi(uint64(l)) } - l = len(m.ReplySubject) + l = len(m.CorrelationId) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + if m.AckPolicy != 0 { + n += 1 + sovApi(uint64(m.AckPolicy)) + } + return n +} + +func (m *PublishResponse) Size() (n int) { + var l int + _ = l + if m.Ack != nil { + l = m.Ack.Size() + n += 1 + l + sovApi(uint64(l)) + } + return n +} + +func (m *PublishToSubjectRequest) Size() (n int) { + var l int + _ = l + l = len(m.Key) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + l = len(m.Value) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + l = len(m.Subject) if l > 0 { n += 1 + l + sovApi(uint64(l)) } @@ -2420,7 +2669,7 @@ func (m *PublishRequest) Size() (n int) { return n } -func (m *PublishResponse) Size() (n int) { +func (m *PublishToSubjectResponse) Size() (n int) { var l int _ = l if m.Ack != nil { @@ -3769,7 +4018,126 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { } case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Headers", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Headers == nil { + m.Headers = make(map[string][]byte) + } + var mapkey string + mapvalue := []byte{} + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthApi + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapbyteLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapbyteLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intMapbyteLen := int(mapbyteLen) + if intMapbyteLen < 0 { + return ErrInvalidLengthApi + } + postbytesIndex := iNdEx + intMapbyteLen + if postbytesIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = make([]byte, mapbyteLen) + copy(mapvalue, dAtA[iNdEx:postbytesIndex]) + iNdEx = postbytesIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.Headers[mapkey] = mapvalue + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckInbox", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3794,11 +4162,11 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Subject = string(dAtA[iNdEx:postIndex]) + m.AckInbox = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: + case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReplySubject", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CorrelationId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3823,9 +4191,252 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ReplySubject = string(dAtA[iNdEx:postIndex]) + m.CorrelationId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 7: + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AckPolicy", wireType) + } + m.AckPolicy = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AckPolicy |= (AckPolicy(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PublishResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PublishResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PublishResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ack", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Ack == nil { + m.Ack = &Ack{} + } + if err := m.Ack.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PublishToSubjectRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PublishToSubjectRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PublishToSubjectRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + byteLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Key = append(m.Key[:0], dAtA[iNdEx:postIndex]...) + if m.Key == nil { + m.Key = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + byteLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Value = append(m.Value[:0], dAtA[iNdEx:postIndex]...) + if m.Value == nil { + m.Value = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + 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 ErrInvalidLengthApi + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Subject = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Headers", wireType) } @@ -3944,7 +4555,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { } m.Headers[mapkey] = mapvalue iNdEx = postIndex - case 8: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AckInbox", wireType) } @@ -3973,7 +4584,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { } m.AckInbox = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 9: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CorrelationId", wireType) } @@ -4002,7 +4613,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { } m.CorrelationId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 10: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field AckPolicy", wireType) } @@ -4042,7 +4653,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *PublishResponse) Unmarshal(dAtA []byte) error { +func (m *PublishToSubjectResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4065,10 +4676,10 @@ func (m *PublishResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PublishResponse: wiretype end group for non-group") + return fmt.Errorf("proto: PublishToSubjectResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PublishResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PublishToSubjectResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6182,89 +6793,92 @@ var ( func init() { proto1.RegisterFile("api.proto", fileDescriptorApi) } var fileDescriptorApi = []byte{ - // 1331 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5b, 0x6e, 0xdb, 0x46, - 0x17, 0x16, 0x49, 0x51, 0x97, 0x23, 0x89, 0x61, 0xc6, 0x97, 0x9f, 0xbf, 0x12, 0x18, 0x06, 0x9b, - 0x34, 0xa9, 0x51, 0xa8, 0x89, 0x8a, 0x02, 0x81, 0xd1, 0x02, 0x65, 0x12, 0x1a, 0x11, 0x22, 0x4b, - 0xc2, 0x48, 0x41, 0xd0, 0x87, 0x22, 0xa0, 0xa8, 0xb1, 0xcd, 0x5a, 0x32, 0x59, 0x92, 0x0a, 0xea, - 0x9d, 0x64, 0x07, 0xd9, 0x41, 0xb7, 0xd0, 0x3c, 0x76, 0x09, 0x45, 0xba, 0x88, 0xbe, 0x15, 0xc5, - 0x0c, 0x6f, 0x43, 0x9a, 0xb6, 0x8a, 0x16, 0x7d, 0xd2, 0xcc, 0x99, 0x73, 0x9b, 0xef, 0x3b, 0x67, - 0x78, 0x04, 0x4d, 0xcb, 0x73, 0x7a, 0x9e, 0xef, 0x86, 0x2e, 0x92, 0xd9, 0x8f, 0xfe, 0x5e, 0x80, - 0xad, 0x67, 0x3e, 0xb1, 0x42, 0x32, 0x0d, 0x7d, 0x62, 0xad, 0x30, 0xf9, 0x71, 0x4d, 0x82, 0x10, - 0x69, 0x50, 0x0f, 0xd6, 0xf3, 0x1f, 0x88, 0x1d, 0x6a, 0xc2, 0xbe, 0xf0, 0xb0, 0x89, 0x93, 0x2d, - 0x42, 0x50, 0xbd, 0xb0, 0x56, 0x44, 0x13, 0x99, 0x98, 0xad, 0xd1, 0x36, 0xc8, 0xa7, 0xbe, 0xbb, - 0xf6, 0x34, 0x89, 0x09, 0xa3, 0x0d, 0xfa, 0x1c, 0x6e, 0xfb, 0xc4, 0x5b, 0x3a, 0xb6, 0x15, 0x3a, - 0xee, 0xc5, 0x91, 0x65, 0x87, 0xae, 0xaf, 0x55, 0xf7, 0x85, 0x87, 0x32, 0xbe, 0x7a, 0x80, 0xf6, - 0x00, 0x3c, 0xcb, 0x0f, 0x1d, 0x2a, 0x0a, 0x34, 0x99, 0xa9, 0x71, 0x12, 0x7d, 0x17, 0xb6, 0xf3, - 0x89, 0x06, 0x9e, 0x7b, 0x11, 0x10, 0xfd, 0x33, 0xd8, 0x7a, 0x4e, 0x96, 0xa4, 0x78, 0x81, 0x24, - 0x4d, 0x21, 0x4b, 0x93, 0xba, 0xc8, 0xab, 0xc6, 0x2e, 0x4e, 0x00, 0x4d, 0xac, 0x75, 0xb0, 0xd9, - 0x43, 0x21, 0x49, 0x71, 0x5f, 0xca, 0x27, 0x89, 0xee, 0x42, 0xd3, 0x27, 0xc1, 0x7a, 0x45, 0x8c, - 0xe5, 0x92, 0x81, 0xd1, 0xc0, 0x99, 0x40, 0xdf, 0x81, 0xad, 0x5c, 0x9c, 0x38, 0xfc, 0x9f, 0x02, - 0xa8, 0xd3, 0xf5, 0x3c, 0xb0, 0x7d, 0x67, 0x4e, 0x92, 0xe8, 0xbb, 0x50, 0x0b, 0x98, 0x5a, 0x1c, - 0x3f, 0xde, 0xd1, 0x08, 0x69, 0x3c, 0xc6, 0x81, 0x8c, 0x33, 0x01, 0x3a, 0x84, 0x4e, 0x10, 0x5a, - 0x7e, 0x38, 0x71, 0x83, 0x48, 0x83, 0xe6, 0xa0, 0xf4, 0xb7, 0x23, 0xd2, 0x7b, 0x53, 0xfe, 0x0c, - 0xe7, 0x55, 0xd1, 0x3d, 0x68, 0x31, 0xc1, 0xf8, 0xe4, 0x24, 0x20, 0x21, 0x23, 0x4a, 0x7a, 0x2a, - 0x3e, 0x12, 0x30, 0x2f, 0x46, 0x07, 0xa0, 0xb0, 0xed, 0xcc, 0x59, 0x91, 0x20, 0xb4, 0x56, 0x1e, - 0xa3, 0x2a, 0x52, 0x2c, 0x9c, 0xa0, 0x4f, 0x41, 0xf1, 0x89, 0xb5, 0x18, 0x4c, 0x31, 0x8e, 0xe8, - 0xd6, 0x6a, 0x0c, 0x92, 0x82, 0x54, 0x7f, 0x04, 0xdb, 0x47, 0x24, 0xb4, 0xcf, 0x8e, 0x49, 0x68, - 0x2d, 0xac, 0xd0, 0xe2, 0x8b, 0x90, 0xdd, 0x3a, 0xd0, 0x84, 0x7d, 0x89, 0x15, 0x61, 0xb4, 0xd5, - 0x03, 0xd8, 0x29, 0x58, 0x44, 0x58, 0xa2, 0x07, 0x50, 0x9f, 0xfb, 0xee, 0x39, 0xf1, 0x23, 0x93, - 0x56, 0xbf, 0x13, 0x5f, 0xfd, 0x29, 0x93, 0xe2, 0xe4, 0x14, 0x3d, 0x86, 0xc6, 0x2a, 0x36, 0x66, - 0x3c, 0xb6, 0xfa, 0x3b, 0x29, 0x48, 0x34, 0x46, 0xea, 0x39, 0x55, 0xd3, 0xdf, 0x49, 0xa0, 0x4c, - 0xd6, 0xf3, 0xa5, 0x13, 0x9c, 0x25, 0x19, 0xaa, 0x20, 0x9d, 0x93, 0x4b, 0x46, 0x51, 0x1b, 0xd3, - 0x25, 0x6d, 0x85, 0xb7, 0xd6, 0x72, 0x1d, 0xf5, 0x47, 0x1b, 0x47, 0x1b, 0x8e, 0x4d, 0xe9, 0x7a, - 0x36, 0xab, 0x45, 0x36, 0xb9, 0x26, 0x94, 0xf3, 0x4d, 0xa8, 0x43, 0x9b, 0x76, 0xd0, 0xe5, 0x34, - 0x3e, 0xae, 0xb1, 0xe3, 0x9c, 0x0c, 0x7d, 0x0d, 0xf5, 0x33, 0x62, 0x2d, 0x28, 0x14, 0x75, 0x76, - 0x41, 0x3d, 0xbe, 0x60, 0xfe, 0x0e, 0xbd, 0x17, 0x91, 0x92, 0x79, 0x11, 0xfa, 0x97, 0x38, 0x31, - 0x41, 0x5d, 0x68, 0x58, 0xf6, 0xf9, 0xe0, 0x62, 0xee, 0xfe, 0xa4, 0x35, 0x98, 0xf7, 0x74, 0x8f, - 0xee, 0x41, 0xc7, 0x76, 0x7d, 0x9f, 0x2c, 0x59, 0xff, 0x0e, 0x16, 0x5a, 0x93, 0x29, 0xe4, 0x85, - 0xa8, 0x07, 0x4d, 0xcb, 0x3e, 0x9f, 0xb8, 0x4b, 0xc7, 0xbe, 0xd4, 0x80, 0xd5, 0xa1, 0x1a, 0x67, - 0x60, 0x24, 0x72, 0x9c, 0xa9, 0x74, 0x0f, 0xa1, 0xcd, 0xa7, 0xc2, 0x63, 0xdb, 0xbc, 0x01, 0xdb, - 0x43, 0xf1, 0x89, 0xa0, 0x7f, 0x01, 0xb7, 0xd2, 0x5b, 0xc5, 0x95, 0x70, 0x17, 0x24, 0xcb, 0x3e, - 0x67, 0xe6, 0xad, 0x3e, 0x64, 0x81, 0x31, 0x15, 0xeb, 0xdf, 0x42, 0x2d, 0xaa, 0x08, 0xa4, 0x80, - 0xe8, 0x2c, 0xe2, 0x28, 0xa2, 0xb3, 0xa0, 0x6d, 0x7f, 0xe6, 0x06, 0x61, 0xf2, 0xbe, 0xd1, 0x35, - 0x95, 0x79, 0xae, 0x1f, 0x32, 0xf2, 0x64, 0xcc, 0xd6, 0xfa, 0xcf, 0x22, 0x28, 0xf9, 0x52, 0x29, - 0x7d, 0x31, 0x38, 0x0e, 0xc5, 0x3c, 0x87, 0x8f, 0x41, 0x26, 0xbe, 0xef, 0xfa, 0x71, 0x8f, 0xde, - 0x29, 0x2d, 0xbf, 0x9e, 0x49, 0x55, 0x70, 0xa4, 0x89, 0xcc, 0xdc, 0xf3, 0x53, 0x65, 0xac, 0xde, - 0x2f, 0xb7, 0x9b, 0xa4, 0x7a, 0x11, 0xb1, 0x9c, 0x61, 0xf7, 0x35, 0xdc, 0x2a, 0x1c, 0xf3, 0x60, - 0xcb, 0x11, 0xd8, 0x3d, 0x1e, 0xec, 0x56, 0x5f, 0x4b, 0x8a, 0x27, 0x31, 0x4c, 0x1b, 0x84, 0xa3, - 0xe1, 0x13, 0x90, 0x59, 0xbe, 0xa8, 0x06, 0xe2, 0xf8, 0xa5, 0x5a, 0x41, 0x08, 0x94, 0x57, 0xa3, - 0x97, 0xa3, 0xf1, 0xeb, 0xd1, 0x9b, 0xe9, 0x0c, 0x9b, 0xc6, 0xb1, 0x2a, 0xe8, 0x0e, 0xdc, 0xbe, - 0xe2, 0x84, 0x63, 0x41, 0x66, 0x2c, 0xec, 0x42, 0x6d, 0xc9, 0x8a, 0x21, 0x46, 0x2d, 0xde, 0xd1, - 0xb2, 0x8c, 0x3f, 0x1d, 0x81, 0x26, 0xb1, 0x37, 0x21, 0xdd, 0xd3, 0x3b, 0x38, 0x81, 0xcf, 0x60, - 0x69, 0x62, 0xba, 0xd4, 0x3f, 0x48, 0x50, 0x3f, 0x26, 0x41, 0x60, 0x9d, 0x12, 0xd4, 0x85, 0x9a, - 0x1b, 0xbd, 0x6c, 0x42, 0xfa, 0x60, 0xc5, 0x92, 0xe4, 0xf6, 0x62, 0x49, 0x1b, 0x4b, 0x7c, 0x1b, - 0xef, 0x43, 0x33, 0x4c, 0xdf, 0xbd, 0xec, 0x81, 0xcc, 0x84, 0x5c, 0xa3, 0xcb, 0xd7, 0x37, 0x7a, - 0xed, 0x86, 0x46, 0xaf, 0xdf, 0xdc, 0xe8, 0x8d, 0x92, 0x46, 0xff, 0x2a, 0x6b, 0xf4, 0x26, 0x2b, - 0x89, 0xa4, 0x94, 0xe2, 0xab, 0xff, 0x8d, 0x0e, 0x87, 0x4d, 0x1d, 0xde, 0xda, 0xd8, 0xe1, 0xed, - 0xff, 0xb6, 0xc3, 0xff, 0x10, 0x40, 0x32, 0xec, 0xf3, 0x6b, 0xbf, 0x8b, 0x07, 0xa0, 0xa6, 0x78, - 0x4e, 0x73, 0x0d, 0x77, 0x45, 0x4e, 0xbf, 0xe2, 0xab, 0xe0, 0x34, 0xd1, 0x8a, 0x5e, 0x64, 0x4e, - 0xc2, 0x95, 0x4a, 0xf5, 0x4a, 0xa9, 0xf0, 0xa8, 0xc9, 0x9b, 0x50, 0xab, 0x6d, 0x44, 0xad, 0xbe, - 0x11, 0x35, 0xfd, 0x05, 0x28, 0xfc, 0xe0, 0x33, 0xf6, 0xae, 0xc5, 0x60, 0xc3, 0x74, 0xa2, 0x3f, - 0x04, 0x85, 0x9f, 0x7f, 0xae, 0xf7, 0xa4, 0x13, 0xe8, 0x70, 0x93, 0xca, 0x3f, 0x0f, 0xb9, 0x61, - 0x20, 0x7a, 0x01, 0x0a, 0x66, 0x9b, 0x7f, 0x7d, 0xb5, 0x5f, 0x44, 0xd8, 0x32, 0xec, 0xd0, 0x79, - 0xeb, 0x84, 0x97, 0x91, 0x33, 0xf3, 0x2d, 0xb9, 0x08, 0xb9, 0x77, 0xa5, 0xca, 0xde, 0x95, 0x07, - 0x20, 0xba, 0x1e, 0x2b, 0x0c, 0xa5, 0xff, 0xbf, 0x14, 0x75, 0xde, 0x6e, 0xec, 0x61, 0xd1, 0xf5, - 0xd0, 0x37, 0xa0, 0xd8, 0x39, 0xd4, 0x59, 0xf6, 0xd9, 0x94, 0x90, 0xa7, 0x04, 0x17, 0x94, 0xa9, - 0xf9, 0x22, 0x07, 0x35, 0x2b, 0xa5, 0xcc, 0x3c, 0xcf, 0x03, 0x2e, 0x28, 0xd3, 0x39, 0xce, 0xe3, - 0xf1, 0x67, 0xa5, 0xd6, 0x4a, 0xe7, 0xb8, 0x1c, 0x37, 0x38, 0xaf, 0x4a, 0x43, 0xfb, 0x39, 0x50, - 0x59, 0x19, 0x66, 0xa1, 0xf3, 0x88, 0xe3, 0x82, 0xf2, 0x01, 0x86, 0x4e, 0x6e, 0x4c, 0x44, 0x6d, - 0x68, 0x8c, 0xcc, 0xd7, 0x6f, 0xc6, 0xa3, 0xe1, 0x77, 0x6a, 0x05, 0x01, 0xd4, 0xc6, 0x47, 0x47, - 0x53, 0x73, 0xa6, 0x0a, 0xf4, 0xc4, 0x34, 0xf0, 0x70, 0x60, 0x4e, 0x67, 0xaa, 0x48, 0x4f, 0x86, - 0xc6, 0x8c, 0xae, 0x25, 0xd4, 0x81, 0xe6, 0x6c, 0x70, 0x6c, 0x4e, 0x67, 0xc6, 0xf1, 0x44, 0xad, - 0x1e, 0x1c, 0x40, 0x33, 0x2d, 0x6d, 0xa6, 0x67, 0x1a, 0xcf, 0x4d, 0xac, 0x56, 0x50, 0x1d, 0x24, - 0x63, 0x38, 0x54, 0x05, 0xd4, 0x80, 0xea, 0x68, 0x3c, 0x32, 0x55, 0xf1, 0xe0, 0x7b, 0x50, 0x8b, - 0x84, 0xa0, 0xdb, 0xd0, 0x79, 0x86, 0x4d, 0x63, 0x66, 0x26, 0x5f, 0x91, 0x0a, 0x15, 0x3d, 0x37, - 0x87, 0x66, 0x26, 0x12, 0x90, 0x0a, 0xed, 0x89, 0xf1, 0x6a, 0x9a, 0x4a, 0x44, 0xaa, 0x84, 0xcd, - 0xe9, 0xab, 0xe3, 0x54, 0x24, 0xf5, 0xdf, 0x4b, 0x20, 0x19, 0x93, 0x01, 0x1a, 0x40, 0x9b, 0xa7, - 0x10, 0x75, 0x4b, 0x78, 0x8d, 0x27, 0xa4, 0xee, 0x9d, 0xd2, 0xb3, 0x78, 0x7a, 0xaf, 0x50, 0x57, - 0x3c, 0x9d, 0xa9, 0xab, 0x92, 0xbf, 0x25, 0xa9, 0xab, 0xd2, 0xff, 0x21, 0x15, 0x74, 0x04, 0x2d, - 0x8e, 0x5b, 0xf4, 0xff, 0xab, 0x7c, 0x27, 0x8e, 0xba, 0x65, 0x47, 0xa9, 0x9f, 0x27, 0xd0, 0x4c, - 0xff, 0x51, 0xa0, 0xa4, 0xce, 0x8b, 0xff, 0x31, 0xba, 0x4a, 0xfe, 0x3b, 0xa1, 0x57, 0x1e, 0x09, - 0x68, 0x08, 0x9d, 0xdc, 0x64, 0x8d, 0x92, 0x8c, 0xcb, 0x26, 0xf4, 0xee, 0xdd, 0xf2, 0xc3, 0x34, - 0x8f, 0x43, 0xa8, 0xc7, 0x73, 0x19, 0xda, 0x29, 0x9d, 0x3e, 0xbb, 0xbb, 0x45, 0x71, 0x62, 0xfb, - 0xf4, 0xfe, 0x87, 0x8f, 0x7b, 0xc2, 0xaf, 0x1f, 0xf7, 0x84, 0xdf, 0x3e, 0xee, 0x09, 0xef, 0x7e, - 0xdf, 0xab, 0xc0, 0x96, 0xe3, 0xf6, 0x96, 0xce, 0x49, 0x38, 0xf7, 0x9d, 0xc5, 0x29, 0x89, 0x0c, - 0xe7, 0x35, 0xf6, 0xf3, 0xe5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x4a, 0x7a, 0x07, 0xdc, - 0x0e, 0x00, 0x00, + // 1384 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdb, 0x6e, 0xdb, 0x46, + 0x13, 0x16, 0x49, 0x1d, 0xac, 0xd1, 0x21, 0xcc, 0xfa, 0x10, 0xfe, 0x4a, 0xe0, 0xdf, 0x60, 0x93, + 0x26, 0x75, 0x0b, 0x37, 0x51, 0x51, 0x20, 0x30, 0x5a, 0xa0, 0x4c, 0x42, 0x23, 0x42, 0x64, 0x49, + 0x58, 0xca, 0x08, 0x7a, 0x51, 0x04, 0x14, 0xb5, 0xb6, 0x59, 0x4b, 0x26, 0x4b, 0x52, 0x41, 0xfd, + 0x26, 0x7d, 0x83, 0xbe, 0x41, 0x5f, 0xa1, 0xb9, 0xcc, 0x75, 0xaf, 0x8a, 0xf4, 0x21, 0x7a, 0x17, + 0x14, 0xbb, 0x3c, 0xed, 0xd2, 0x72, 0x94, 0xb6, 0x48, 0xaf, 0xc8, 0x9d, 0x9d, 0xd3, 0xce, 0x37, + 0x33, 0x3b, 0x0b, 0x75, 0xdb, 0x77, 0xf7, 0xfc, 0xc0, 0x8b, 0x3c, 0x54, 0x61, 0x1f, 0xfd, 0x67, + 0x09, 0xd6, 0x1f, 0x07, 0xc4, 0x8e, 0x88, 0x15, 0x05, 0xc4, 0x9e, 0x63, 0xf2, 0xc3, 0x82, 0x84, + 0x11, 0xd2, 0xa0, 0x16, 0x2e, 0x26, 0xdf, 0x13, 0x27, 0xd2, 0xa4, 0x1d, 0xe9, 0x5e, 0x1d, 0xa7, + 0x4b, 0x84, 0xa0, 0x7c, 0x6e, 0xcf, 0x89, 0x26, 0x33, 0x32, 0xfb, 0x47, 0x1b, 0x50, 0x39, 0x09, + 0xbc, 0x85, 0xaf, 0x29, 0x8c, 0x18, 0x2f, 0xd0, 0x67, 0x70, 0x3d, 0x20, 0xfe, 0xcc, 0x75, 0xec, + 0xc8, 0xf5, 0xce, 0x0f, 0x6c, 0x27, 0xf2, 0x02, 0xad, 0xbc, 0x23, 0xdd, 0xab, 0xe0, 0xcb, 0x1b, + 0x68, 0x1b, 0xc0, 0xb7, 0x83, 0xc8, 0xa5, 0xa4, 0x50, 0xab, 0x30, 0x36, 0x8e, 0xa2, 0x6f, 0xc1, + 0x86, 0xe8, 0x68, 0xe8, 0x7b, 0xe7, 0x21, 0xd1, 0x3f, 0x81, 0xf5, 0x27, 0x64, 0x46, 0x8a, 0x07, + 0x48, 0xdd, 0x94, 0x72, 0x37, 0xa9, 0x0a, 0x91, 0x35, 0x51, 0x71, 0x0c, 0x68, 0x64, 0x2f, 0xc2, + 0xd5, 0x1a, 0x0a, 0x4e, 0xca, 0x3b, 0x8a, 0xe8, 0x24, 0xba, 0x05, 0xf5, 0x80, 0x84, 0x8b, 0x39, + 0x31, 0x66, 0x33, 0x16, 0x8c, 0x35, 0x9c, 0x13, 0xf4, 0x4d, 0x58, 0x17, 0xec, 0x24, 0xe6, 0xdf, + 0x4a, 0xa0, 0x5a, 0x8b, 0x49, 0xe8, 0x04, 0xee, 0x84, 0xa4, 0xd6, 0xb7, 0xa0, 0x1a, 0x32, 0xb6, + 0xc4, 0x7e, 0xb2, 0xa2, 0x16, 0x32, 0x7b, 0x0c, 0x83, 0x0a, 0xce, 0x09, 0x68, 0x1f, 0x5a, 0x61, + 0x64, 0x07, 0xd1, 0xc8, 0x0b, 0x63, 0x0e, 0xea, 0x43, 0xbb, 0xbb, 0x11, 0x83, 0xbe, 0x67, 0xf1, + 0x7b, 0x58, 0x64, 0x45, 0xb7, 0xa1, 0xc1, 0x08, 0xc3, 0xe3, 0xe3, 0x90, 0x44, 0x0c, 0x28, 0xe5, + 0x91, 0x7c, 0x5f, 0xc2, 0x3c, 0x19, 0xed, 0x42, 0x9b, 0x2d, 0xc7, 0xee, 0x9c, 0x84, 0x91, 0x3d, + 0xf7, 0x19, 0x54, 0x31, 0x63, 0x61, 0x07, 0x7d, 0x0c, 0xed, 0x80, 0xd8, 0xd3, 0x9e, 0x85, 0x71, + 0x0c, 0xb7, 0x56, 0x65, 0x21, 0x29, 0x50, 0xf5, 0xfb, 0xb0, 0x71, 0x40, 0x22, 0xe7, 0xf4, 0x90, + 0x44, 0xf6, 0xd4, 0x8e, 0x6c, 0x3e, 0x09, 0xd9, 0xa9, 0x43, 0x4d, 0xda, 0x51, 0x58, 0x12, 0xc6, + 0x4b, 0x3d, 0x84, 0xcd, 0x82, 0x44, 0x1c, 0x4b, 0x74, 0x17, 0x6a, 0x93, 0xc0, 0x3b, 0x23, 0x41, + 0x2c, 0xd2, 0xe8, 0xb6, 0x92, 0xa3, 0x3f, 0x62, 0x54, 0x9c, 0xee, 0xa2, 0x07, 0xb0, 0x36, 0x4f, + 0x84, 0x19, 0x8e, 0x8d, 0xee, 0x66, 0x16, 0x24, 0x6a, 0x23, 0xd3, 0x9c, 0xb1, 0xe9, 0xbf, 0xc9, + 0xd0, 0x1e, 0x2d, 0x26, 0x33, 0x37, 0x3c, 0x4d, 0x3d, 0x54, 0x41, 0x39, 0x23, 0x17, 0x0c, 0xa2, + 0x26, 0xa6, 0xbf, 0xb4, 0x14, 0x5e, 0xda, 0xb3, 0x45, 0x5c, 0x1f, 0x4d, 0x1c, 0x2f, 0x38, 0x34, + 0x95, 0xab, 0xd1, 0x2c, 0x17, 0xd1, 0xfc, 0x0a, 0x6a, 0xa7, 0xc4, 0x9e, 0xd2, 0xc3, 0x54, 0x98, + 0x8b, 0x7a, 0xe2, 0xa2, 0xe8, 0xc5, 0xde, 0xd3, 0x98, 0xc9, 0x3c, 0x8f, 0x82, 0x0b, 0x9c, 0x8a, + 0xa0, 0x0e, 0xac, 0xd9, 0xce, 0x59, 0xef, 0x7c, 0xe2, 0xfd, 0xc8, 0xe2, 0x5e, 0xc7, 0xd9, 0x1a, + 0xdd, 0x86, 0x96, 0xe3, 0x05, 0x01, 0x99, 0xb1, 0x0a, 0xec, 0x4d, 0xb5, 0x1a, 0x63, 0x10, 0x89, + 0x68, 0x0f, 0xea, 0xb6, 0x73, 0x36, 0xf2, 0x66, 0xae, 0x73, 0xa1, 0xad, 0xb1, 0x4c, 0x52, 0x13, + 0x0f, 0x8c, 0x94, 0x8e, 0x73, 0x96, 0xce, 0x3e, 0x34, 0x79, 0x57, 0xf8, 0xe8, 0xd4, 0xdf, 0x11, + 0x9d, 0x7d, 0xf9, 0xa1, 0xa4, 0x7f, 0x0e, 0xd7, 0xb2, 0x53, 0x25, 0x58, 0xde, 0x02, 0xc5, 0x76, + 0xce, 0x98, 0x78, 0xa3, 0x0b, 0xb9, 0x61, 0x4c, 0xc9, 0xfa, 0x6b, 0x19, 0x6e, 0x24, 0x12, 0x63, + 0xcf, 0x8a, 0x9b, 0xd3, 0xdf, 0x85, 0x85, 0xeb, 0x72, 0x8a, 0xd8, 0xe5, 0xcc, 0x3c, 0xf4, 0x65, + 0x16, 0xfa, 0x4f, 0xc5, 0xd0, 0x17, 0x4d, 0xbe, 0x07, 0x06, 0x95, 0x55, 0x18, 0x54, 0x57, 0x62, + 0x50, 0xfb, 0xb0, 0x18, 0x3c, 0x04, 0xed, 0xf2, 0xf1, 0xde, 0x0b, 0x8c, 0x6f, 0xa0, 0x1a, 0x17, + 0x18, 0x6a, 0x83, 0xec, 0x4e, 0x13, 0x73, 0xb2, 0x3b, 0xa5, 0x5d, 0xf4, 0xd4, 0x0b, 0xa3, 0xf4, + 0xba, 0xa0, 0xff, 0x94, 0xe6, 0x7b, 0x41, 0x1c, 0xf3, 0x0a, 0x66, 0xff, 0xfa, 0x2f, 0x32, 0xb4, + 0xc5, 0xca, 0x5b, 0xda, 0x80, 0x39, 0xc4, 0x64, 0x11, 0xb1, 0x07, 0x50, 0x21, 0x41, 0xe0, 0x05, + 0x49, 0xcb, 0xbb, 0xb9, 0xb4, 0x9a, 0xf7, 0x4c, 0xca, 0x82, 0x63, 0x4e, 0x64, 0x0a, 0xdd, 0x3c, + 0xc6, 0xf9, 0xce, 0x72, 0xb9, 0x51, 0xc6, 0x17, 0x23, 0xcc, 0x09, 0x76, 0x9e, 0xc3, 0xb5, 0xc2, + 0x36, 0x1f, 0xf5, 0x4a, 0x1c, 0xf5, 0x3d, 0x3e, 0xea, 0x8d, 0xae, 0x96, 0xa6, 0x53, 0x2a, 0x98, + 0xf5, 0x1b, 0x0e, 0x8f, 0x8f, 0xa0, 0xc2, 0xfc, 0x45, 0x55, 0x90, 0x87, 0xcf, 0xd4, 0x12, 0x42, + 0xd0, 0x3e, 0x1a, 0x3c, 0x1b, 0x0c, 0x9f, 0x0f, 0x5e, 0x58, 0x63, 0x6c, 0x1a, 0x87, 0xaa, 0xa4, + 0xbb, 0x70, 0xfd, 0x92, 0x12, 0x0e, 0x85, 0x0a, 0x43, 0x61, 0x0b, 0xaa, 0x33, 0x96, 0x15, 0x49, + 0xd4, 0x92, 0x15, 0xcd, 0xcf, 0xe4, 0x26, 0x0e, 0x35, 0x85, 0xb5, 0xd8, 0x6c, 0x4d, 0xcf, 0xe0, + 0x86, 0x01, 0x0b, 0x4b, 0x1d, 0xd3, 0x5f, 0xfd, 0x95, 0x02, 0xb5, 0x43, 0x12, 0x86, 0xf6, 0x09, + 0x41, 0x1d, 0xa8, 0x7a, 0xf1, 0x45, 0x21, 0x65, 0xfd, 0x3f, 0xa1, 0xa4, 0xa7, 0x97, 0x97, 0x94, + 0x9f, 0xc2, 0x97, 0xdf, 0x0e, 0xd4, 0xa3, 0xec, 0x1a, 0xc9, 0xef, 0x9b, 0x9c, 0xc8, 0xf5, 0xcd, + 0xca, 0xd5, 0x7d, 0xb3, 0x5a, 0xec, 0x9b, 0x5c, 0x92, 0xd4, 0xc4, 0x24, 0xd1, 0xa1, 0x49, 0xcf, + 0x77, 0x91, 0x64, 0x37, 0x6b, 0x6a, 0x75, 0x2c, 0xd0, 0xd0, 0x97, 0x79, 0xe9, 0xd7, 0x59, 0x4a, + 0xa4, 0xa9, 0x94, 0x1c, 0xfd, 0x3d, 0x4a, 0x1d, 0x56, 0x95, 0x7a, 0x63, 0x65, 0xa9, 0x37, 0x3f, + 0x6c, 0xa9, 0xff, 0x29, 0x81, 0x62, 0x38, 0x67, 0x57, 0x8e, 0x19, 0xbb, 0xa0, 0x66, 0xf1, 0xb4, + 0x84, 0x82, 0xbb, 0x44, 0xa7, 0x43, 0xd1, 0x3c, 0x3c, 0xb1, 0x84, 0x46, 0xca, 0x51, 0xb8, 0x54, + 0x29, 0x5f, 0x4a, 0x95, 0xff, 0xbc, 0x41, 0xea, 0x4f, 0xa1, 0xcd, 0xcf, 0x91, 0x43, 0xff, 0xca, + 0x18, 0xac, 0x18, 0xf6, 0xf4, 0x7b, 0xd0, 0xe6, 0xc7, 0xc9, 0xab, 0x35, 0xe9, 0x04, 0x5a, 0xdc, + 0xe0, 0xf7, 0xcf, 0x4d, 0xae, 0x98, 0x2f, 0x9f, 0x42, 0x1b, 0xb3, 0xc5, 0xbf, 0x3e, 0xda, 0xaf, + 0x32, 0xac, 0x1b, 0x4e, 0xe4, 0xbe, 0x74, 0xa3, 0x8b, 0x58, 0x99, 0xf9, 0x92, 0x9c, 0x47, 0x5c, + 0x5f, 0x29, 0xb3, 0xbe, 0x72, 0x17, 0x64, 0xcf, 0x67, 0x89, 0xd1, 0xee, 0xde, 0xc8, 0xa2, 0xce, + 0xcb, 0x0d, 0x7d, 0x2c, 0x7b, 0x3e, 0xfa, 0x1a, 0xda, 0x8e, 0x10, 0x75, 0xe6, 0x7d, 0x3e, 0x74, + 0x89, 0x90, 0xe0, 0x02, 0x33, 0x15, 0x9f, 0x0a, 0xa1, 0x66, 0xa9, 0x94, 0x8b, 0x8b, 0x38, 0xe0, + 0x02, 0x33, 0x1d, 0x8b, 0x7d, 0x3e, 0xfe, 0x2c, 0xd5, 0x1a, 0xd9, 0x58, 0x2c, 0x60, 0x83, 0x45, + 0x56, 0x6a, 0x3a, 0x10, 0x82, 0xca, 0xd2, 0x30, 0x37, 0x2d, 0x46, 0x1c, 0x17, 0x98, 0x77, 0x31, + 0xb4, 0x84, 0xa9, 0x1b, 0x35, 0x61, 0x6d, 0x60, 0x3e, 0x7f, 0x31, 0x1c, 0xf4, 0xbf, 0x55, 0x4b, + 0x08, 0xa0, 0x3a, 0x3c, 0x38, 0xb0, 0xcc, 0xb1, 0x2a, 0xd1, 0x1d, 0xd3, 0xc0, 0xfd, 0x9e, 0x69, + 0x8d, 0x55, 0x99, 0xee, 0xf4, 0x8d, 0x31, 0xfd, 0x57, 0x50, 0x0b, 0xea, 0xe3, 0xde, 0xa1, 0x69, + 0x8d, 0x8d, 0xc3, 0x91, 0x5a, 0xde, 0xdd, 0x85, 0x7a, 0x96, 0xda, 0x8c, 0xcf, 0x34, 0x9e, 0x98, + 0x58, 0x2d, 0xa1, 0x1a, 0x28, 0x46, 0xbf, 0xaf, 0x4a, 0x68, 0x0d, 0xca, 0x83, 0xe1, 0xc0, 0x54, + 0xe5, 0xdd, 0xef, 0x40, 0x2d, 0x02, 0x82, 0xae, 0x43, 0xeb, 0x31, 0x36, 0x8d, 0xb1, 0x99, 0xde, + 0x22, 0x25, 0x4a, 0x7a, 0x62, 0xf6, 0xcd, 0x9c, 0x24, 0x21, 0x15, 0x9a, 0x23, 0xe3, 0xc8, 0xca, + 0x28, 0x32, 0x65, 0xc2, 0xa6, 0x75, 0x74, 0x98, 0x91, 0x94, 0xee, 0x5b, 0x05, 0x14, 0x63, 0xd4, + 0x43, 0x3d, 0x68, 0xf2, 0x10, 0xa2, 0xce, 0x12, 0x5c, 0x93, 0x51, 0xa9, 0x73, 0x73, 0xe9, 0x5e, + 0xf2, 0x18, 0x2a, 0x51, 0x55, 0x3c, 0x9c, 0x99, 0xaa, 0x25, 0xaf, 0xbc, 0x4c, 0xd5, 0xd2, 0x67, + 0x5d, 0x09, 0x1d, 0x40, 0x83, 0xc3, 0x16, 0xfd, 0xef, 0x32, 0xde, 0xa9, 0xa2, 0xce, 0xb2, 0xad, + 0x4c, 0xcf, 0x43, 0xa8, 0x67, 0x0f, 0x34, 0x94, 0xe6, 0x79, 0xf1, 0xc9, 0xd6, 0x69, 0x8b, 0xf7, + 0x84, 0x5e, 0xba, 0x2f, 0xa1, 0x3e, 0xb4, 0x84, 0x87, 0x0a, 0x4a, 0x3d, 0x5e, 0xf6, 0xe0, 0xe9, + 0xdc, 0x5a, 0xbe, 0x99, 0xf9, 0xb1, 0x0f, 0xb5, 0x64, 0x40, 0x43, 0x9b, 0x4b, 0x9f, 0x02, 0x9d, + 0xad, 0x22, 0x39, 0x93, 0x3d, 0x02, 0xb5, 0x38, 0xdc, 0xa1, 0xed, 0x77, 0x0f, 0xb5, 0x9d, 0xff, + 0x5f, 0xb9, 0x9f, 0xaa, 0x7d, 0x74, 0xe7, 0xd5, 0x9b, 0x6d, 0xe9, 0xf5, 0x9b, 0x6d, 0xe9, 0xf7, + 0x37, 0xdb, 0xd2, 0x4f, 0x7f, 0x6c, 0x97, 0x60, 0xdd, 0xf5, 0xf6, 0x66, 0xee, 0x71, 0x34, 0x09, + 0xdc, 0xe9, 0x09, 0x89, 0x35, 0x4c, 0xaa, 0xec, 0xf3, 0xc5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xb4, 0xba, 0x77, 0xe8, 0x82, 0x10, 0x00, 0x00, } diff --git a/py/api_pb2.py b/py/api_pb2.py index 86dbe87..cabe256 100644 --- a/py/api_pb2.py +++ b/py/api_pb2.py @@ -21,7 +21,7 @@ package='proto', syntax='proto3', serialized_options=_b('\n\023io.liftbridge.proto'), - serialized_pb=_b('\n\tapi.proto\x12\x05proto\"r\n\x13\x43reateStreamRequest\x12\x0f\n\x07subject\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\r\n\x05group\x18\x03 \x01(\t\x12\x19\n\x11replicationFactor\x18\x04 \x01(\x05\x12\x12\n\npartitions\x18\x05 \x01(\x05\"\x16\n\x14\x43reateStreamResponse\"#\n\x13\x44\x65leteStreamRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x16\n\x14\x44\x65leteStreamResponse\"I\n\x12PauseStreamRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\x12\x11\n\tresumeAll\x18\x03 \x01(\x08\"\x15\n\x13PauseStreamResponse\"\xaf\x01\n\x10SubscribeRequest\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x11\n\tpartition\x18\x02 \x01(\x05\x12+\n\rstartPosition\x18\x03 \x01(\x0e\x32\x14.proto.StartPosition\x12\x17\n\x0bstartOffset\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x1a\n\x0estartTimestamp\x18\x05 \x01(\x03\x42\x02\x30\x01\x12\x16\n\x0ereadISRReplica\x18\x06 \x01(\x08\"\'\n\x14\x46\x65tchMetadataRequest\x12\x0f\n\x07streams\x18\x01 \x03(\t\"`\n\x15\x46\x65tchMetadataResponse\x12\x1e\n\x07\x62rokers\x18\x01 \x03(\x0b\x32\r.proto.Broker\x12\'\n\x08metadata\x18\x02 \x03(\x0b\x32\x15.proto.StreamMetadata\"\xa9\x02\n\x0ePublishRequest\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x0e\n\x06stream\x18\x03 \x01(\t\x12\x11\n\tpartition\x18\x04 \x01(\x05\x12\x0f\n\x07subject\x18\x05 \x01(\t\x12\x14\n\x0creplySubject\x18\x06 \x01(\t\x12\x33\n\x07headers\x18\x07 \x03(\x0b\x32\".proto.PublishRequest.HeadersEntry\x12\x10\n\x08\x61\x63kInbox\x18\x08 \x01(\t\x12\x15\n\rcorrelationId\x18\t \x01(\t\x12#\n\tackPolicy\x18\n \x01(\x0e\x32\x10.proto.AckPolicy\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"*\n\x0fPublishResponse\x12\x17\n\x03\x61\x63k\x18\x01 \x01(\x0b\x32\n.proto.Ack\"0\n\x06\x42roker\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\x05\"\x88\x02\n\x0eStreamMetadata\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07subject\x18\x02 \x01(\t\x12*\n\x05\x65rror\x18\x03 \x01(\x0e\x32\x1b.proto.StreamMetadata.Error\x12\x39\n\npartitions\x18\x04 \x03(\x0b\x32%.proto.StreamMetadata.PartitionsEntry\x1aK\n\x0fPartitionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\'\n\x05value\x18\x02 \x01(\x0b\x32\x18.proto.PartitionMetadata:\x02\x38\x01\"#\n\x05\x45rror\x12\x06\n\x02OK\x10\x00\x12\x12\n\x0eUNKNOWN_STREAM\x10\x01\"N\n\x11PartitionMetadata\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0e\n\x06leader\x18\x02 \x01(\t\x12\x10\n\x08replicas\x18\x03 \x03(\t\x12\x0b\n\x03isr\x18\x04 \x03(\t\"\xc6\x02\n\x07Message\x12\x12\n\x06offset\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x12\r\n\x05value\x18\x03 \x01(\x0c\x12\x15\n\ttimestamp\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x0e\n\x06stream\x18\x05 \x01(\t\x12\x11\n\tpartition\x18\x06 \x01(\x05\x12\x0f\n\x07subject\x18\x07 \x01(\t\x12\x14\n\x0creplySubject\x18\x08 \x01(\t\x12,\n\x07headers\x18\t \x03(\x0b\x32\x1b.proto.Message.HeadersEntry\x12\x10\n\x08\x61\x63kInbox\x18\n \x01(\t\x12\x15\n\rcorrelationId\x18\x0b \x01(\t\x12#\n\tackPolicy\x18\x0c \x01(\x0e\x32\x10.proto.AckPolicy\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"\xa5\x01\n\x03\x41\x63k\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x18\n\x10partitionSubject\x18\x02 \x01(\t\x12\x12\n\nmsgSubject\x18\x03 \x01(\t\x12\x12\n\x06offset\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x10\n\x08\x61\x63kInbox\x18\x05 \x01(\t\x12\x15\n\rcorrelationId\x18\x06 \x01(\t\x12#\n\tackPolicy\x18\x07 \x01(\x0e\x32\x10.proto.AckPolicy\"4\n\x0e\x43reateStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\" \n\x0e\x44\x65leteStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\"F\n\rPauseStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\x12\x11\n\tresumeAll\x18\x03 \x01(\x08\"4\n\x0eResumeStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\"\x80\x02\n\x13\x41\x63tivityStreamEvent\x12\n\n\x02id\x18\x01 \x01(\x04\x12#\n\x02op\x18\x02 \x01(\x0e\x32\x17.proto.ActivityStreamOp\x12-\n\x0e\x63reateStreamOp\x18\x03 \x01(\x0b\x32\x15.proto.CreateStreamOp\x12-\n\x0e\x64\x65leteStreamOp\x18\x04 \x01(\x0b\x32\x15.proto.DeleteStreamOp\x12+\n\rpauseStreamOp\x18\x05 \x01(\x0b\x32\x14.proto.PauseStreamOp\x12-\n\x0eresumeStreamOp\x18\x06 \x01(\x0b\x32\x15.proto.ResumeStreamOp*R\n\rStartPosition\x12\x0c\n\x08NEW_ONLY\x10\x00\x12\n\n\x06OFFSET\x10\x01\x12\x0c\n\x08\x45\x41RLIEST\x10\x02\x12\n\n\x06LATEST\x10\x03\x12\r\n\tTIMESTAMP\x10\x04**\n\tAckPolicy\x12\n\n\x06LEADER\x10\x00\x12\x07\n\x03\x41LL\x10\x01\x12\x08\n\x04NONE\x10\x02*]\n\x10\x41\x63tivityStreamOp\x12\x11\n\rCREATE_STREAM\x10\x00\x12\x11\n\rDELETE_STREAM\x10\x01\x12\x10\n\x0cPAUSE_STREAM\x10\x02\x12\x11\n\rRESUME_STREAM\x10\x03\x32\xa7\x03\n\x03\x41PI\x12I\n\x0c\x43reateStream\x12\x1a.proto.CreateStreamRequest\x1a\x1b.proto.CreateStreamResponse\"\x00\x12I\n\x0c\x44\x65leteStream\x12\x1a.proto.DeleteStreamRequest\x1a\x1b.proto.DeleteStreamResponse\"\x00\x12\x46\n\x0bPauseStream\x12\x19.proto.PauseStreamRequest\x1a\x1a.proto.PauseStreamResponse\"\x00\x12\x38\n\tSubscribe\x12\x17.proto.SubscribeRequest\x1a\x0e.proto.Message\"\x00\x30\x01\x12L\n\rFetchMetadata\x12\x1b.proto.FetchMetadataRequest\x1a\x1c.proto.FetchMetadataResponse\"\x00\x12:\n\x07Publish\x12\x15.proto.PublishRequest\x1a\x16.proto.PublishResponse\"\x00\x42\x15\n\x13io.liftbridge.protob\x06proto3') + serialized_pb=_b('\n\tapi.proto\x12\x05proto\"r\n\x13\x43reateStreamRequest\x12\x0f\n\x07subject\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\r\n\x05group\x18\x03 \x01(\t\x12\x19\n\x11replicationFactor\x18\x04 \x01(\x05\x12\x12\n\npartitions\x18\x05 \x01(\x05\"\x16\n\x14\x43reateStreamResponse\"#\n\x13\x44\x65leteStreamRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x16\n\x14\x44\x65leteStreamResponse\"I\n\x12PauseStreamRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\x12\x11\n\tresumeAll\x18\x03 \x01(\x08\"\x15\n\x13PauseStreamResponse\"\xaf\x01\n\x10SubscribeRequest\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x11\n\tpartition\x18\x02 \x01(\x05\x12+\n\rstartPosition\x18\x03 \x01(\x0e\x32\x14.proto.StartPosition\x12\x17\n\x0bstartOffset\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x1a\n\x0estartTimestamp\x18\x05 \x01(\x03\x42\x02\x30\x01\x12\x16\n\x0ereadISRReplica\x18\x06 \x01(\x08\"\'\n\x14\x46\x65tchMetadataRequest\x12\x0f\n\x07streams\x18\x01 \x03(\t\"`\n\x15\x46\x65tchMetadataResponse\x12\x1e\n\x07\x62rokers\x18\x01 \x03(\x0b\x32\r.proto.Broker\x12\'\n\x08metadata\x18\x02 \x03(\x0b\x32\x15.proto.StreamMetadata\"\x82\x02\n\x0ePublishRequest\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x0e\n\x06stream\x18\x03 \x01(\t\x12\x11\n\tpartition\x18\x04 \x01(\x05\x12\x33\n\x07headers\x18\x05 \x03(\x0b\x32\".proto.PublishRequest.HeadersEntry\x12\x10\n\x08\x61\x63kInbox\x18\x06 \x01(\t\x12\x15\n\rcorrelationId\x18\x07 \x01(\t\x12#\n\tackPolicy\x18\x08 \x01(\x0e\x32\x10.proto.AckPolicy\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"*\n\x0fPublishResponse\x12\x17\n\x03\x61\x63k\x18\x01 \x01(\x0b\x32\n.proto.Ack\"\x82\x02\n\x17PublishToSubjectRequest\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x0f\n\x07subject\x18\x03 \x01(\t\x12<\n\x07headers\x18\x04 \x03(\x0b\x32+.proto.PublishToSubjectRequest.HeadersEntry\x12\x10\n\x08\x61\x63kInbox\x18\x05 \x01(\t\x12\x15\n\rcorrelationId\x18\x06 \x01(\t\x12#\n\tackPolicy\x18\x07 \x01(\x0e\x32\x10.proto.AckPolicy\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"3\n\x18PublishToSubjectResponse\x12\x17\n\x03\x61\x63k\x18\x01 \x01(\x0b\x32\n.proto.Ack\"0\n\x06\x42roker\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\x05\"\x88\x02\n\x0eStreamMetadata\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07subject\x18\x02 \x01(\t\x12*\n\x05\x65rror\x18\x03 \x01(\x0e\x32\x1b.proto.StreamMetadata.Error\x12\x39\n\npartitions\x18\x04 \x03(\x0b\x32%.proto.StreamMetadata.PartitionsEntry\x1aK\n\x0fPartitionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\'\n\x05value\x18\x02 \x01(\x0b\x32\x18.proto.PartitionMetadata:\x02\x38\x01\"#\n\x05\x45rror\x12\x06\n\x02OK\x10\x00\x12\x12\n\x0eUNKNOWN_STREAM\x10\x01\"N\n\x11PartitionMetadata\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0e\n\x06leader\x18\x02 \x01(\t\x12\x10\n\x08replicas\x18\x03 \x03(\t\x12\x0b\n\x03isr\x18\x04 \x03(\t\"\xc6\x02\n\x07Message\x12\x12\n\x06offset\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x12\r\n\x05value\x18\x03 \x01(\x0c\x12\x15\n\ttimestamp\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x0e\n\x06stream\x18\x05 \x01(\t\x12\x11\n\tpartition\x18\x06 \x01(\x05\x12\x0f\n\x07subject\x18\x07 \x01(\t\x12\x14\n\x0creplySubject\x18\x08 \x01(\t\x12,\n\x07headers\x18\t \x03(\x0b\x32\x1b.proto.Message.HeadersEntry\x12\x10\n\x08\x61\x63kInbox\x18\n \x01(\t\x12\x15\n\rcorrelationId\x18\x0b \x01(\t\x12#\n\tackPolicy\x18\x0c \x01(\x0e\x32\x10.proto.AckPolicy\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"\xa5\x01\n\x03\x41\x63k\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x18\n\x10partitionSubject\x18\x02 \x01(\t\x12\x12\n\nmsgSubject\x18\x03 \x01(\t\x12\x12\n\x06offset\x18\x04 \x01(\x03\x42\x02\x30\x01\x12\x10\n\x08\x61\x63kInbox\x18\x05 \x01(\t\x12\x15\n\rcorrelationId\x18\x06 \x01(\t\x12#\n\tackPolicy\x18\x07 \x01(\x0e\x32\x10.proto.AckPolicy\"4\n\x0e\x43reateStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\" \n\x0e\x44\x65leteStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\"F\n\rPauseStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\x12\x11\n\tresumeAll\x18\x03 \x01(\x08\"4\n\x0eResumeStreamOp\x12\x0e\n\x06stream\x18\x01 \x01(\t\x12\x12\n\npartitions\x18\x02 \x03(\x05\"\x80\x02\n\x13\x41\x63tivityStreamEvent\x12\n\n\x02id\x18\x01 \x01(\x04\x12#\n\x02op\x18\x02 \x01(\x0e\x32\x17.proto.ActivityStreamOp\x12-\n\x0e\x63reateStreamOp\x18\x03 \x01(\x0b\x32\x15.proto.CreateStreamOp\x12-\n\x0e\x64\x65leteStreamOp\x18\x04 \x01(\x0b\x32\x15.proto.DeleteStreamOp\x12+\n\rpauseStreamOp\x18\x05 \x01(\x0b\x32\x14.proto.PauseStreamOp\x12-\n\x0eresumeStreamOp\x18\x06 \x01(\x0b\x32\x15.proto.ResumeStreamOp*R\n\rStartPosition\x12\x0c\n\x08NEW_ONLY\x10\x00\x12\n\n\x06OFFSET\x10\x01\x12\x0c\n\x08\x45\x41RLIEST\x10\x02\x12\n\n\x06LATEST\x10\x03\x12\r\n\tTIMESTAMP\x10\x04**\n\tAckPolicy\x12\n\n\x06LEADER\x10\x00\x12\x07\n\x03\x41LL\x10\x01\x12\x08\n\x04NONE\x10\x02*]\n\x10\x41\x63tivityStreamOp\x12\x11\n\rCREATE_STREAM\x10\x00\x12\x11\n\rDELETE_STREAM\x10\x01\x12\x10\n\x0cPAUSE_STREAM\x10\x02\x12\x11\n\rRESUME_STREAM\x10\x03\x32\xfe\x03\n\x03\x41PI\x12I\n\x0c\x43reateStream\x12\x1a.proto.CreateStreamRequest\x1a\x1b.proto.CreateStreamResponse\"\x00\x12I\n\x0c\x44\x65leteStream\x12\x1a.proto.DeleteStreamRequest\x1a\x1b.proto.DeleteStreamResponse\"\x00\x12\x46\n\x0bPauseStream\x12\x19.proto.PauseStreamRequest\x1a\x1a.proto.PauseStreamResponse\"\x00\x12\x38\n\tSubscribe\x12\x17.proto.SubscribeRequest\x1a\x0e.proto.Message\"\x00\x30\x01\x12L\n\rFetchMetadata\x12\x1b.proto.FetchMetadataRequest\x1a\x1c.proto.FetchMetadataResponse\"\x00\x12:\n\x07Publish\x12\x15.proto.PublishRequest\x1a\x16.proto.PublishResponse\"\x00\x12U\n\x10PublishToSubject\x12\x1e.proto.PublishToSubjectRequest\x1a\x1f.proto.PublishToSubjectResponse\"\x00\x42\x15\n\x13io.liftbridge.protob\x06proto3') ) _STARTPOSITION = _descriptor.EnumDescriptor( @@ -53,8 +53,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2347, - serialized_end=2429, + serialized_start=2622, + serialized_end=2704, ) _sym_db.RegisterEnumDescriptor(_STARTPOSITION) @@ -80,8 +80,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2431, - serialized_end=2473, + serialized_start=2706, + serialized_end=2748, ) _sym_db.RegisterEnumDescriptor(_ACKPOLICY) @@ -111,8 +111,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2475, - serialized_end=2568, + serialized_start=2750, + serialized_end=2843, ) _sym_db.RegisterEnumDescriptor(_ACTIVITYSTREAMOP) @@ -148,8 +148,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1260, - serialized_end=1295, + serialized_start=1535, + serialized_end=1570, ) _sym_db.RegisterEnumDescriptor(_STREAMMETADATA_ERROR) @@ -529,8 +529,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=888, - serialized_end=934, + serialized_start=849, + serialized_end=895, ) _PUBLISHREQUEST = _descriptor.Descriptor( @@ -569,43 +569,170 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='subject', full_name='proto.PublishRequest.subject', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + name='headers', full_name='proto.PublishRequest.headers', index=4, + number=5, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='replySubject', full_name='proto.PublishRequest.replySubject', index=5, + name='ackInbox', full_name='proto.PublishRequest.ackInbox', index=5, number=6, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='headers', full_name='proto.PublishRequest.headers', index=6, - number=7, type=11, cpp_type=10, label=3, + name='correlationId', full_name='proto.PublishRequest.correlationId', index=6, + number=7, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='ackPolicy', full_name='proto.PublishRequest.ackPolicy', index=7, + number=8, type=14, cpp_type=8, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[_PUBLISHREQUEST_HEADERSENTRY, ], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=637, + serialized_end=895, +) + + +_PUBLISHRESPONSE = _descriptor.Descriptor( + name='PublishResponse', + full_name='proto.PublishResponse', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='ack', full_name='proto.PublishResponse.ack', index=0, + number=1, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=897, + serialized_end=939, +) + + +_PUBLISHTOSUBJECTREQUEST_HEADERSENTRY = _descriptor.Descriptor( + name='HeadersEntry', + full_name='proto.PublishToSubjectRequest.HeadersEntry', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='key', full_name='proto.PublishToSubjectRequest.HeadersEntry.key', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='value', full_name='proto.PublishToSubjectRequest.HeadersEntry.value', index=1, + number=2, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=_b('8\001'), + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=849, + serialized_end=895, +) + +_PUBLISHTOSUBJECTREQUEST = _descriptor.Descriptor( + name='PublishToSubjectRequest', + full_name='proto.PublishToSubjectRequest', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='key', full_name='proto.PublishToSubjectRequest.key', index=0, + number=1, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='value', full_name='proto.PublishToSubjectRequest.value', index=1, + number=2, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='subject', full_name='proto.PublishToSubjectRequest.subject', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='headers', full_name='proto.PublishToSubjectRequest.headers', index=3, + number=4, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='ackInbox', full_name='proto.PublishRequest.ackInbox', index=7, - number=8, type=9, cpp_type=9, label=1, + name='ackInbox', full_name='proto.PublishToSubjectRequest.ackInbox', index=4, + number=5, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='correlationId', full_name='proto.PublishRequest.correlationId', index=8, - number=9, type=9, cpp_type=9, label=1, + name='correlationId', full_name='proto.PublishToSubjectRequest.correlationId', index=5, + number=6, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='ackPolicy', full_name='proto.PublishRequest.ackPolicy', index=9, - number=10, type=14, cpp_type=8, label=1, + name='ackPolicy', full_name='proto.PublishToSubjectRequest.ackPolicy', index=6, + number=7, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -613,7 +740,7 @@ ], extensions=[ ], - nested_types=[_PUBLISHREQUEST_HEADERSENTRY, ], + nested_types=[_PUBLISHTOSUBJECTREQUEST_HEADERSENTRY, ], enum_types=[ ], serialized_options=None, @@ -622,20 +749,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=637, - serialized_end=934, + serialized_start=942, + serialized_end=1200, ) -_PUBLISHRESPONSE = _descriptor.Descriptor( - name='PublishResponse', - full_name='proto.PublishResponse', +_PUBLISHTOSUBJECTRESPONSE = _descriptor.Descriptor( + name='PublishToSubjectResponse', + full_name='proto.PublishToSubjectResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='ack', full_name='proto.PublishResponse.ack', index=0, + name='ack', full_name='proto.PublishToSubjectResponse.ack', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -653,8 +780,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=936, - serialized_end=978, + serialized_start=1202, + serialized_end=1253, ) @@ -698,8 +825,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=980, - serialized_end=1028, + serialized_start=1255, + serialized_end=1303, ) @@ -736,8 +863,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1183, - serialized_end=1258, + serialized_start=1458, + serialized_end=1533, ) _STREAMMETADATA = _descriptor.Descriptor( @@ -788,8 +915,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1031, - serialized_end=1295, + serialized_start=1306, + serialized_end=1570, ) @@ -840,8 +967,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1297, - serialized_end=1375, + serialized_start=1572, + serialized_end=1650, ) @@ -878,8 +1005,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=888, - serialized_end=934, + serialized_start=849, + serialized_end=895, ) _MESSAGE = _descriptor.Descriptor( @@ -985,8 +1112,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1378, - serialized_end=1704, + serialized_start=1653, + serialized_end=1979, ) @@ -1058,8 +1185,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1707, - serialized_end=1872, + serialized_start=1982, + serialized_end=2147, ) @@ -1096,8 +1223,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1874, - serialized_end=1926, + serialized_start=2149, + serialized_end=2201, ) @@ -1127,8 +1254,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1928, - serialized_end=1960, + serialized_start=2203, + serialized_end=2235, ) @@ -1172,8 +1299,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1962, - serialized_end=2032, + serialized_start=2237, + serialized_end=2307, ) @@ -1210,8 +1337,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2034, - serialized_end=2086, + serialized_start=2309, + serialized_end=2361, ) @@ -1276,8 +1403,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2089, - serialized_end=2345, + serialized_start=2364, + serialized_end=2620, ) _SUBSCRIBEREQUEST.fields_by_name['startPosition'].enum_type = _STARTPOSITION @@ -1287,6 +1414,10 @@ _PUBLISHREQUEST.fields_by_name['headers'].message_type = _PUBLISHREQUEST_HEADERSENTRY _PUBLISHREQUEST.fields_by_name['ackPolicy'].enum_type = _ACKPOLICY _PUBLISHRESPONSE.fields_by_name['ack'].message_type = _ACK +_PUBLISHTOSUBJECTREQUEST_HEADERSENTRY.containing_type = _PUBLISHTOSUBJECTREQUEST +_PUBLISHTOSUBJECTREQUEST.fields_by_name['headers'].message_type = _PUBLISHTOSUBJECTREQUEST_HEADERSENTRY +_PUBLISHTOSUBJECTREQUEST.fields_by_name['ackPolicy'].enum_type = _ACKPOLICY +_PUBLISHTOSUBJECTRESPONSE.fields_by_name['ack'].message_type = _ACK _STREAMMETADATA_PARTITIONSENTRY.fields_by_name['value'].message_type = _PARTITIONMETADATA _STREAMMETADATA_PARTITIONSENTRY.containing_type = _STREAMMETADATA _STREAMMETADATA.fields_by_name['error'].enum_type = _STREAMMETADATA_ERROR @@ -1312,6 +1443,8 @@ DESCRIPTOR.message_types_by_name['FetchMetadataResponse'] = _FETCHMETADATARESPONSE DESCRIPTOR.message_types_by_name['PublishRequest'] = _PUBLISHREQUEST DESCRIPTOR.message_types_by_name['PublishResponse'] = _PUBLISHRESPONSE +DESCRIPTOR.message_types_by_name['PublishToSubjectRequest'] = _PUBLISHTOSUBJECTREQUEST +DESCRIPTOR.message_types_by_name['PublishToSubjectResponse'] = _PUBLISHTOSUBJECTRESPONSE DESCRIPTOR.message_types_by_name['Broker'] = _BROKER DESCRIPTOR.message_types_by_name['StreamMetadata'] = _STREAMMETADATA DESCRIPTOR.message_types_by_name['PartitionMetadata'] = _PARTITIONMETADATA @@ -1412,6 +1545,28 @@ }) _sym_db.RegisterMessage(PublishResponse) +PublishToSubjectRequest = _reflection.GeneratedProtocolMessageType('PublishToSubjectRequest', (_message.Message,), { + + 'HeadersEntry' : _reflection.GeneratedProtocolMessageType('HeadersEntry', (_message.Message,), { + 'DESCRIPTOR' : _PUBLISHTOSUBJECTREQUEST_HEADERSENTRY, + '__module__' : 'api_pb2' + # @@protoc_insertion_point(class_scope:proto.PublishToSubjectRequest.HeadersEntry) + }) + , + 'DESCRIPTOR' : _PUBLISHTOSUBJECTREQUEST, + '__module__' : 'api_pb2' + # @@protoc_insertion_point(class_scope:proto.PublishToSubjectRequest) + }) +_sym_db.RegisterMessage(PublishToSubjectRequest) +_sym_db.RegisterMessage(PublishToSubjectRequest.HeadersEntry) + +PublishToSubjectResponse = _reflection.GeneratedProtocolMessageType('PublishToSubjectResponse', (_message.Message,), { + 'DESCRIPTOR' : _PUBLISHTOSUBJECTRESPONSE, + '__module__' : 'api_pb2' + # @@protoc_insertion_point(class_scope:proto.PublishToSubjectResponse) + }) +_sym_db.RegisterMessage(PublishToSubjectResponse) + Broker = _reflection.GeneratedProtocolMessageType('Broker', (_message.Message,), { 'DESCRIPTOR' : _BROKER, '__module__' : 'api_pb2' @@ -1503,6 +1658,7 @@ _SUBSCRIBEREQUEST.fields_by_name['startOffset']._options = None _SUBSCRIBEREQUEST.fields_by_name['startTimestamp']._options = None _PUBLISHREQUEST_HEADERSENTRY._options = None +_PUBLISHTOSUBJECTREQUEST_HEADERSENTRY._options = None _STREAMMETADATA_PARTITIONSENTRY._options = None _MESSAGE_HEADERSENTRY._options = None _MESSAGE.fields_by_name['offset']._options = None @@ -1515,8 +1671,8 @@ file=DESCRIPTOR, index=0, serialized_options=None, - serialized_start=2571, - serialized_end=2994, + serialized_start=2846, + serialized_end=3356, methods=[ _descriptor.MethodDescriptor( name='CreateStream', @@ -1572,6 +1728,15 @@ output_type=_PUBLISHRESPONSE, serialized_options=None, ), + _descriptor.MethodDescriptor( + name='PublishToSubject', + full_name='proto.API.PublishToSubject', + index=6, + containing_service=None, + input_type=_PUBLISHTOSUBJECTREQUEST, + output_type=_PUBLISHTOSUBJECTRESPONSE, + serialized_options=None, + ), ]) _sym_db.RegisterServiceDescriptor(_API) diff --git a/py/api_pb2_grpc.py b/py/api_pb2_grpc.py index 75ad4dc..af12967 100644 --- a/py/api_pb2_grpc.py +++ b/py/api_pb2_grpc.py @@ -44,6 +44,11 @@ def __init__(self, channel): request_serializer=api__pb2.PublishRequest.SerializeToString, response_deserializer=api__pb2.PublishResponse.FromString, ) + self.PublishToSubject = channel.unary_unary( + '/proto.API/PublishToSubject', + request_serializer=api__pb2.PublishToSubjectRequest.SerializeToString, + response_deserializer=api__pb2.PublishToSubjectResponse.FromString, + ) class APIServicer(object): @@ -94,7 +99,7 @@ def FetchMetadata(self, request, context): raise NotImplementedError('Method not implemented!') def Publish(self, request, context): - """Publish a new message to a subject. If the AckPolicy is not NONE and a + """Publish a new message to a stream. If the AckPolicy is not NONE and a deadline is provided, this will synchronously block until the ack is received. If the ack is not received in time, a DeadlineExceeded status code is returned. @@ -103,6 +108,16 @@ def Publish(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def PublishToSubject(self, request, context): + """Publish a Liftbridge message to a NATS subject. If the AckPolicy is not NONE and a + deadline is provided, this will synchronously block until the first ack + is received. If an ack is not received in time, a DeadlineExceeded + status code is returned. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_APIServicer_to_server(servicer, server): rpc_method_handlers = { @@ -136,6 +151,11 @@ def add_APIServicer_to_server(servicer, server): request_deserializer=api__pb2.PublishRequest.FromString, response_serializer=api__pb2.PublishResponse.SerializeToString, ), + 'PublishToSubject': grpc.unary_unary_rpc_method_handler( + servicer.PublishToSubject, + request_deserializer=api__pb2.PublishToSubjectRequest.FromString, + response_serializer=api__pb2.PublishToSubjectResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'proto.API', rpc_method_handlers)