Skip to content

Commit 5cdc590

Browse files
authored
Merge e8fa8cb into 24653e0
2 parents 24653e0 + e8fa8cb commit 5cdc590

5 files changed

Lines changed: 1702 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ public Response<Set<String>> sdiff(String... keys) {
786786
}
787787

788788
@Override
789-
public Response<Long> sdiffStore(String dstKey, String... keys) {
789+
public Response<Long> sdiffstore(String dstKey, String... keys) {
790790
return appendCommand(commandObjects.sdiffstore(dstKey, keys));
791791
}
792792

src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
3737

3838
Response<Set<String>> sdiff(String... keys);
3939

40-
Response<Long> sdiffStore(String dstKey, String... keys);
40+
Response<Long> sdiffstore(String dstKey, String... keys);
41+
42+
/**
43+
* @deprecated Use {@code redis.clients.jedis.commands.SetPipelineCommands#sdiffstore(java.lang.String, java.lang.String...)}
44+
*/
45+
default Response<Long> sdiffStore(String dstKey, String... keys) {
46+
return sdiffstore(dstKey, keys);
47+
}
4148

4249
Response<Set<String>> sinter(String... keys);
4350

src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void slowlogBinaryObjectDetails() {
116116
List<Object> log = (List<Object>) logs.get(0);
117117
assertThat((Long) log.get(0), Matchers.greaterThan(0L));
118118
assertThat((Long) log.get(1), Matchers.greaterThan(0L));
119-
assertThat((Long) log.get(2), Matchers.greaterThan(0L));
119+
assertThat((Long) log.get(2), Matchers.greaterThanOrEqualTo(0L));
120120
List<Object> args = (List<Object>) log.get(3);
121121
assertEquals(4, args.size());
122122
assertArrayEquals(Protocol.Command.CONFIG.getRaw(), (byte[]) args.get(0));

0 commit comments

Comments
 (0)