Skip to content

Fix XAUTOCLAIM skipping the initial start message. #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix XAUTOCLAIM skipping the initial start message. #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@ func xautoclaim(
return nextCallId, nil
}

msgs := g.pendingAfter(start)
msgs := g.pendingAfterOrEqual(start)
var res []StreamEntry
for i, p := range msgs {
if minIdleTime > 0 && now.Before(p.lastDelivery.Add(minIdleTime)) {
Expand Down
19 changes: 17 additions & 2 deletions cmd_stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,21 @@ func TestStreamAutoClaim(t *testing.T) {
proto.Array(),
),
)

// read again using the ID returned from the last XAUTOCLAIM call as 'start'.
// the results include that starting message. unlike XREADGROUP, the results of XAUTOCLAIM
// are INCLUSIVE of the start ID.
mustDo(t, c,
"XAUTOCLAIM", "planets", "processing", "bob", "15000", "0-2", "COUNT", "1",
proto.Array(
proto.String("0-0"),
proto.Array(
proto.Array(proto.String("0-2"), proto.Strings("name", "Venus")),
),
proto.Array(),
),
)

mustDo(t, c,
"XINFO", "CONSUMERS", "planets", "processing",
proto.Array(
Expand Down Expand Up @@ -1350,8 +1365,8 @@ func TestStreamAutoClaim(t *testing.T) {
proto.Array(
proto.String("0-2"),
proto.String("bob"),
proto.Int(20000),
proto.Int(4),
proto.Int(0),
proto.Int(5),
),
),
)
Expand Down
7 changes: 7 additions & 0 deletions stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,13 @@ func (s *streamKey) delete(ids []string) (int, error) {
return count, nil
}

func (g *streamGroup) pendingAfterOrEqual(id string) []pendingEntry {
pos := sort.Search(len(g.pending), func(i int) bool {
return streamCmp(id, g.pending[i].id) <= 0
})
return g.pending[pos:]
}

func (g *streamGroup) pendingAfter(id string) []pendingEntry {
pos := sort.Search(len(g.pending), func(i int) bool {
return streamCmp(id, g.pending[i].id) < 0
Expand Down