Skip to content

Commit 5602ba9

Browse files
author
dengliming
authored
Add test case for handling consumername == NULL case in xpending (#2451)
1 parent 02ff807 commit 5602ba9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/redis/clients/jedis/Jedis.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,9 +4254,6 @@ public List<StreamPendingEntry> xpending(final String key, final String groupnam
42544254
final StreamEntryID start, final StreamEntryID end, final int count, final String consumername) {
42554255
checkIsInMultiOrPipeline();
42564256
client.xpending(key, groupname, start, end, count, consumername);
4257-
4258-
// TODO handle consumername == NULL case
4259-
42604257
return BuilderFactory.STREAM_PENDING_ENTRY_LIST.build(client.getObjectMultiBulkReply());
42614258
}
42624259

src/test/java/redis/clients/jedis/tests/commands/StreamsCommandsTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void xreadWithParams() {
195195
assertEquals(1, streams1.get(0).getValue().size());
196196
assertEquals(id1, streams1.get(0).getValue().get(0).getID());
197197
assertEquals(map, streams1.get(0).getValue().get(0).getFields());
198-
198+
199199
assertNull(jedis.xread(XReadParams.xReadParams().block(1), Collections.singletonMap("xread-stream1", id1)));
200200
assertNull(jedis.xread(XReadParams.xReadParams(), Collections.singletonMap("xread-stream1", id1)));
201201

@@ -444,6 +444,13 @@ public void xpendeing() {
444444
assertEquals(1, pendingRange.get(0).getDeliveredTimes());
445445
assertEquals("xpendeing-consumer", pendingRange.get(0).getConsumerName());
446446

447+
// Without consumer
448+
pendingRange = jedis.xpending("xpendeing-stream", "xpendeing-group", null, null, 3, null);
449+
assertEquals(1, pendingRange.size());
450+
assertEquals(id1, pendingRange.get(0).getID());
451+
assertEquals(1, pendingRange.get(0).getDeliveredTimes());
452+
assertEquals("xpendeing-consumer", pendingRange.get(0).getConsumerName());
453+
447454
// Sleep for 1000ms so we can claim events pending for more than 500ms
448455
try {
449456
Thread.sleep(1000);

0 commit comments

Comments
 (0)