Skip to content

xrange make count optional #2380

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

Closed
wants to merge 5 commits into from
Closed

xrange make count optional #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da156b6
xrange make count optional
dengliming Feb 27, 2021
501903c
Merge remote-tracking branch 'upstream/master' into xrang-28
dengliming Mar 11, 2021
a846802
Merge remote-tracking branch 'upstream/master' into xrang-28
dengliming Mar 18, 2021
2720500
Merge remote-tracking branch 'origin/xrang-28' into xrang-28
dengliming Mar 18, 2021
245b7b2
Update javadoc
dengliming Mar 18, 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
14 changes: 11 additions & 3 deletions src/main/java/redis/clients/jedis/BinaryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,15 +1587,23 @@ public void xlen(final byte[] key) {
*/
@Deprecated
public void xrange(final byte[] key, final byte[] start, final byte[] end, final long count) {
sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count));
xrange(key, start, end, (int) count);
}

public void xrange(final byte[] key, final byte[] start, final byte[] end, final int count) {
sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count));
if (count > 0) {
sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count));
} else {
sendCommand(XRANGE, key, start, end);
}
}

public void xrevrange(final byte[] key, final byte[] end, final byte[] start, final int count) {
sendCommand(XREVRANGE, key, end, start, Keyword.COUNT.getRaw(), toByteArray(count));
if (count > 0) {
sendCommand(XREVRANGE, key, end, start, Keyword.COUNT.getRaw(), toByteArray(count));
} else {
sendCommand(XREVRANGE, key, end, start);
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/redis/clients/jedis/commands/JedisCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(String key, String member, dou
* @param key
* @param start minimum {@link StreamEntryID} for the retrieved range, passing <code>null</code> will indicate minimum ID possible in the stream
* @param end maximum {@link StreamEntryID} for the retrieved range, passing <code>null</code> will indicate maximum ID possible in the stream
* @param count maximum number of entries returned
* @param count maximum number of entries returned, only work if count greater than zero
* @return The entries with IDs matching the specified range.
*/
List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end, int count);
Expand All @@ -471,7 +471,7 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(String key, String member, dou
* @param key
* @param start minimum {@link StreamEntryID} for the retrieved range, passing <code>null</code> will indicate minimum ID possible in the stream
* @param end maximum {@link StreamEntryID} for the retrieved range, passing <code>null</code> will indicate maximum ID possible in the stream
* @param count The entries with IDs matching the specified range.
* @param count The entries with IDs matching the specified range, only work if count greater than zero.
* @return the entries with IDs matching the specified range, from the higher ID to the lower ID matching.
*/
List<StreamEntry> xrevrange(String key, StreamEntryID end, StreamEntryID start, int count);
Expand Down
5 changes: 5 additions & 0 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 @@ -142,6 +142,9 @@ public void xrange() {
List<byte[]> cRange = jedis.xrange("xrange-stream".getBytes(), id1.toString().getBytes(),
id2.toString().getBytes(), 10L + Integer.MAX_VALUE);
assertEquals(2, cRange.size());

List<StreamEntry> range8 = jedis.xrange("xrange-stream", id1, id2, -1);
assertEquals(2, range8.size());
}

@Test
Expand Down Expand Up @@ -277,6 +280,8 @@ public void xrevrange() {
List<StreamEntry> range7 = jedis.xrevrange("xrevrange-stream", id2, id2, 4);
assertEquals(1, range7.size());

List<StreamEntry> range8 = jedis.xrevrange("xrevrange-stream", id2, id1, -1);
assertEquals(2, range8.size());
}

@Test
Expand Down