benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QueueId wrapper + test

Browse Source
This commit is contained in:
Sergey Cherepanov 2023-05-15 20:01:52 +02:00 committed by Mikhail Iudin
parent 3d4ac4d130
commit b8cb74d2ff
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/streampool/stream.go
View File

@ -25,6 +25,7 @@ func (sr *stream) write(msg drpc.Message) (err error) {
var queueId string var queueId string
if qId, ok := msg.(MessageQueueId); ok { if qId, ok := msg.(MessageQueueId); ok {
queueId = qId.MessageQueueId() queueId = qId.MessageQueueId()
msg = qId.DrpcMessage()
} }
return sr.queue.Add(sr.stream.Context(), queueId, msg) return sr.queue.Add(sr.stream.Context(), queueId, msg)
} }

19
net/streampool/streampool.go
View File

@ -27,6 +27,7 @@ type PeerGetter func(ctx context.Context) (peers []peer.Peer, err error)
type MessageQueueId interface { type MessageQueueId interface {
MessageQueueId() string MessageQueueId() string
DrpcMessage() drpc.Message
} }
// StreamPool keeps and read streams // StreamPool keeps and read streams
@ -363,3 +364,21 @@ func removeStream(m map[string][]uint32, key string, streamId uint32) {
m[key] = streamIds m[key] = streamIds
} }
} }
// WithQueueId wraps the message and adds queueId
func WithQueueId(msg drpc.Message, queueId string) drpc.Message {
return &messageWithQueueId{queueId: queueId, Message: msg}
}
type messageWithQueueId struct {
drpc.Message
queueId string
}
func (m messageWithQueueId) MessageQueueId() string {
return m.queueId
}
func (m messageWithQueueId) DrpcMessage() drpc.Message {
return m.Message
}

2
net/streampool/streampool_test.go
View File

@ -39,7 +39,7 @@ func TestStreamPool_AddStream(t *testing.T) {
require.NoError(t, fx.AddStream(s2, "space2", "common")) require.NoError(t, fx.AddStream(s2, "space2", "common"))
require.NoError(t, fx.Broadcast(ctx, &testservice.StreamMessage{ReqData: "space1"}, "space1")) require.NoError(t, fx.Broadcast(ctx, &testservice.StreamMessage{ReqData: "space1"}, "space1"))
require.NoError(t, fx.Broadcast(ctx, &testservice.StreamMessage{ReqData: "space2"}, "space2")) require.NoError(t, fx.Broadcast(ctx, WithQueueId(&testservice.StreamMessage{ReqData: "space2"}, "q2"), "space2"))
require.NoError(t, fx.Broadcast(ctx, &testservice.StreamMessage{ReqData: "common"}, "common")) require.NoError(t, fx.Broadcast(ctx, &testservice.StreamMessage{ReqData: "common"}, "common"))
var serverResults []string var serverResults []string