Skip to content

Added missing idle args in XPendingExtArgs #1750

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

Merged
monkey92t merged 9 commits into from
May 13, 2021
Merged

Added missing idle args in XPendingExtArgs #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
687b6ed
Added missing idle args in XPendingExtArgs
parvez0 May 11, 2021
81591a2
Fixed args order for XPending idle time
parvez0 May 11, 2021
3574fe6
Converting idle duration to milli second before passing as an argument
parvez0 May 11, 2021
70f4078
Added separate test case for XPending with idle time
parvez0 May 12, 2021
e5009af
Added missing idle args in XPendingExtArgs
parvez0 May 11, 2021
e2a76f9
Fixed commit messages
parvez0 May 12, 2021
eac0be6
Merge branch 'master' into pr1750
monkey92t May 13, 2021
88dbad3
fix XPendingExtArgs
monkey92t May 13, 2021
868494a
fix XPendingExt
monkey92t May 13, 2021
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
9 changes: 7 additions & 2 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1811,15 +1811,20 @@ func (c cmdable) XPending(ctx context.Context, stream, group string) *XPendingCm
type XPendingExtArgs struct {
Stream string
Group string
Idle time.Duration
Start string
End string
Count int64
Consumer string
}

func (c cmdable) XPendingExt(ctx context.Context, a *XPendingExtArgs) *XPendingExtCmd {
args := make([]interface{}, 0, 7)
args = append(args, "xpending", a.Stream, a.Group, a.Start, a.End, a.Count)
args := make([]interface{}, 0, 9)
args = append(args, "xpending", a.Stream, a.Group)
if a.Idle != 0 {
args = append(args, "idle", formatMs(ctx, a.Idle))
}
args = append(args, a.Start, a.End, a.Count)
if a.Consumer != "" {
args = append(args, a.Consumer)
}
Expand Down
11 changes: 8 additions & 3 deletions commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4225,15 +4225,15 @@ var _ = Describe("Commands", func() {
Higher: "3-0",
Consumers: map[string]int64{"consumer": 3},
}))

infoExt, err := client.XPendingExt(ctx, &redis.XPendingExtArgs{
args := &redis.XPendingExtArgs{
Stream: "stream",
Group: "group",
Start: "-",
End: "+",
Count: 10,
Consumer: "consumer",
}).Result()
}
infoExt, err := client.XPendingExt(ctx, args).Result()
Expect(err).NotTo(HaveOccurred())
for i := range infoExt {
infoExt[i].Idle = 0
Expand All @@ -4244,6 +4244,11 @@ var _ = Describe("Commands", func() {
{ID: "3-0", Consumer: "consumer", Idle: 0, RetryCount: 1},
}))

args.Idle = 72 * time.Hour
infoExt, err = client.XPendingExt(ctx, args).Result()
Expect(err).NotTo(HaveOccurred())
Expect(infoExt).To(HaveLen(0))

n, err := client.XGroupDelConsumer(ctx, "stream", "group", "consumer").Result()
Expect(err).NotTo(HaveOccurred())
Expect(n).To(Equal(int64(3)))
Expand Down