Merge e8fa8cb into 24653e0

redis · Mar 14, 2024 · 5cdc590 · 5cdc590
2 parents 24653e0 + e8fa8cb
commit 5cdc590
Show file tree

Hide file tree

Showing 5 changed files with 1,702 additions and 3 deletions.
diff --git a/src/main/java/redis/clients/jedis/PipeliningBase.java b/src/main/java/redis/clients/jedis/PipeliningBase.java
@@ -786,7 +786,7 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(String dstKey, String... keys) {
+  public Response<Long> sdiffstore(String dstKey, String... keys) {
     return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 

diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
@@ -37,7 +37,14 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
 
   Response<Set<String>> sdiff(String... keys);
 
-  Response<Long> sdiffStore(String dstKey, String... keys);
+  Response<Long> sdiffstore(String dstKey, String... keys);
+
+  /**
+   * @deprecated Use {@code redis.clients.jedis.commands.SetPipelineCommands#sdiffstore(java.lang.String, java.lang.String...)}
+   */
+  default Response<Long> sdiffStore(String dstKey, String... keys) {
+    return sdiffstore(dstKey, keys);
+  }
 
   Response<Set<String>> sinter(String... keys);
 

diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java
@@ -116,7 +116,7 @@ public void slowlogBinaryObjectDetails() {
     List<Object> log = (List<Object>) logs.get(0);
     assertThat((Long) log.get(0), Matchers.greaterThan(0L));
     assertThat((Long) log.get(1), Matchers.greaterThan(0L));
-    assertThat((Long) log.get(2), Matchers.greaterThan(0L));
+    assertThat((Long) log.get(2), Matchers.greaterThanOrEqualTo(0L));
     List<Object> args = (List<Object>) log.get(3);
     assertEquals(4, args.size());
     assertArrayEquals(Protocol.Command.CONFIG.getRaw(), (byte[]) args.get(0));