Skip to content
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

fix #2243 return null when redis returns nil on deleted entries #2244

Merged
merged 1 commit into from
Sep 13, 2020
Merged

fix #2243 return null when redis returns nil on deleted entries #2244

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
4 changes: 4 additions & 0 deletions src/main/java/redis/clients/jedis/BuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,10 @@ public List<StreamEntry> build(Object data) {
}

for(ArrayList<Object> res : objectList) {
if(res == null) {
responses.add(null);
continue;
}
String entryIdString = SafeEncoder.encode((byte[])res.get(0));
StreamEntryID entryID = new StreamEntryID(entryIdString);
List<byte[]> hash = (List<byte[]>)res.get(1);
Expand Down
22 changes: 18 additions & 4 deletions src/test/java/redis/clients/jedis/tests/commands/StreamsCommandsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static redis.clients.jedis.StreamGroupInfo.CONSUMERS;
Expand Down Expand Up @@ -300,26 +301,39 @@ public void xpendeing() {
map.put("f1", "v1");
StreamEntryID id1 = jedis.xadd("xpendeing-stream", null, map);

String status = jedis.xgroupCreate("xpendeing-stream", "xpendeing-group", null, false);
assertEquals("OK", jedis.xgroupCreate("xpendeing-stream", "xpendeing-group", null, false));


Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xpendeing-stream", StreamEntryID.UNRECEIVED_ENTRY);

// Empty Stream
// Read the event from Stream put it on pending
List<Entry<String, List<StreamEntry>>> range = jedis.xreadGroup("xpendeing-group", "xpendeing-consumer", 1, 1L, false, streamQeury1);
assertEquals(1, range.size());
assertEquals(1, range.get(0).getValue().size());
assertEquals(map, range.get(0).getValue().get(0).getFields());

// Get the pending event
List<StreamPendingEntry> pendingRange = jedis.xpending("xpendeing-stream", "xpendeing-group", null, null, 3, "xpendeing-consumer");
assertEquals(1, pendingRange.size());
assertEquals(id1, pendingRange.get(0).getID());
assertEquals(1, pendingRange.get(0).getDeliveredTimes());
assertEquals("xpendeing-consumer", pendingRange.get(0).getConsumerName());

// Sleep for 1000ms so we can claim events pending for more than 500ms
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}

List<StreamEntry> claimRange = jedis.xclaim("xpendeing-stream", "xpendeing-group", "xpendeing-consumer2", 500, 0, 0, false, pendingRange.get(0).getID());
assertEquals(1, pendingRange.size());
List<StreamEntry> claimRange = jedis.xclaim("xpendeing-stream", "xpendeing-group", "xpendeing-consumer2", 500, 0, 0, false, id1);
assertEquals(1, claimRange.size());

// Deleted events should return as null on XClaim
assertEquals(1, jedis.xdel("xpendeing-stream", id1));
List<StreamEntry> claimRangeDel = jedis.xclaim("xpendeing-stream", "xpendeing-group", "xpendeing-consumer2", 0, 0, 0, false, id1);
assertEquals(1, claimRangeDel.size());
assertNull(claimRangeDel.get(0));

Long pendingMessageNum = jedis.xgroupDelConsumer("xpendeing-stream", "xpendeing-group", "xpendeing-consumer2");
assertEquals(1L, pendingMessageNum.longValue());
Expand Down