Merge branch 'master' into master

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

@@ -389,6 +389,22 @@ public String toString() {
     }
   };
 
+  public static final Builder<KeyValue<Long, Double>> ZRANK_WITHSCORE_PAIR = new Builder<KeyValue<Long, Double>>() {
+    @Override
+    public KeyValue<Long, Double> build(Object data) {
+      if (data == null) {
+        return null;
+      }
+      List<Object> l = (List<Object>) data;
+      return new KeyValue<>(LONG.build(l.get(0)), DOUBLE.build(l.get(1)));
+    }
+
+    @Override
+    public String toString() {
+      return "KeyValue<Long, Double>";
+    }
+  };
+
   public static final Builder<KeyValue<String, List<String>>> KEYED_STRING_LIST
       = new Builder<KeyValue<String, List<String>>>() {
     @Override

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

@@ -1380,6 +1380,14 @@ public final CommandObject<Long> zrevrank(String key, String member) {
     return new CommandObject<>(commandArguments(ZREVRANK).key(key).add(member), BuilderFactory.LONG);
   }
 
+  public final CommandObject<KeyValue<Long, Double>> zrankWithScore(String key, String member) {
+    return new CommandObject<>(commandArguments(ZRANK).key(key).add(member).add(WITHSCORE), BuilderFactory.ZRANK_WITHSCORE_PAIR);
+  }
+
+  public final CommandObject<KeyValue<Long, Double>> zrevrankWithScore(String key, String member) {
+    return new CommandObject<>(commandArguments(ZREVRANK).key(key).add(member).add(WITHSCORE), BuilderFactory.ZRANK_WITHSCORE_PAIR);
+  }
+
   public final CommandObject<Long> zrank(byte[] key, byte[] member) {
     return new CommandObject<>(commandArguments(ZRANK).key(key).add(member), BuilderFactory.LONG);
   }
@@ -1388,6 +1396,14 @@ public final CommandObject<Long> zrevrank(byte[] key, byte[] member) {
     return new CommandObject<>(commandArguments(ZREVRANK).key(key).add(member), BuilderFactory.LONG);
   }
 
+  public final CommandObject<KeyValue<Long, Double>> zrankWithScore(byte[] key, byte[] member) {
+    return new CommandObject<>(commandArguments(ZRANK).key(key).add(member).add(WITHSCORE), BuilderFactory.ZRANK_WITHSCORE_PAIR);
+  }
+
+  public final CommandObject<KeyValue<Long, Double>> zrevrankWithScore(byte[] key, byte[] member) {
+    return new CommandObject<>(commandArguments(ZREVRANK).key(key).add(member).add(WITHSCORE), BuilderFactory.ZRANK_WITHSCORE_PAIR);
+  }
+
   public final CommandObject<String> zrandmember(String key) {
     return new CommandObject<>(commandArguments(ZRANDMEMBER).key(key), BuilderFactory.STRING);
   }

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

@@ -2130,6 +2130,32 @@ public Long zrevrank(final byte[] key, final byte[] member) {
     return connection.executeCommand(commandObjects.zrevrank(key, member));
   }
 
+  /**
+   * Returns the rank and the score of member in the sorted set stored at key, with the scores
+   * ordered from low to high.
+   * @param key the key
+   * @param member the member
+   * @return the KeyValue contains rank and score.
+   */
+  @Override
+  public KeyValue<Long, Double> zrankWithScore(byte[] key, byte[] member) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  /**
+   * Returns the rank and the score of member in the sorted set stored at key, with the scores
+   * ordered from high to low.
+   * @param key the key
+   * @param member the member
+   * @return the KeyValue contains rank and score.
+   */
+  @Override
+  public KeyValue<Long, Double> zrevrankWithScore(byte[] key, byte[] member) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public List<byte[]> zrevrange(final byte[] key, final long start, final long stop) {
     checkIsInMultiOrPipeline();
@@ -6559,6 +6585,32 @@ public Long zrevrank(final String key, final String member) {
     return connection.executeCommand(commandObjects.zrevrank(key, member));
   }
 
+  /**
+   * Returns the rank and the score of member in the sorted set stored at key, with the scores
+   * ordered from low to high.
+   * @param key the key
+   * @param member the member
+   * @return the KeyValue contains rank and score.
+   */
+  @Override
+  public KeyValue<Long, Double> zrankWithScore(String key, String member) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  /**
+   * Returns the rank and the score of member in the sorted set stored at key, with the scores
+   * ordered from high to low.
+   * @param key the key
+   * @param member the member
+   * @return the KeyValue contains rank and score.
+   */
+  @Override
+  public KeyValue<Long, Double> zrevrankWithScore(String key, String member) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public List<String> zrevrange(final String key, final long start, final long stop) {
     checkIsInMultiOrPipeline();

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

@@ -976,6 +976,16 @@ public Response<Long> zrevrank(String key, String member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<String>> zrange(String key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));
@@ -2724,6 +2734,16 @@ public Response<Long> zrevrank(byte[] key, byte[] member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<byte[]>> zrange(byte[] key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));

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

@@ -928,6 +928,16 @@ public Response<Long> zrevrank(String key, String member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<String>> zrange(String key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));
@@ -2675,6 +2685,16 @@ public Response<Long> zrevrank(byte[] key, byte[] member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<byte[]>> zrange(byte[] key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));

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

@@ -253,7 +253,7 @@ public byte[] getRaw() {
 
   public static enum Keyword implements Rawable {
 
-    AGGREGATE, ALPHA, BY, GET, LIMIT, NO, NOSORT, ONE, SET, STORE, WEIGHTS, WITHSCORES, RESETSTAT,
+    AGGREGATE, ALPHA, BY, GET, LIMIT, NO, NOSORT, ONE, SET, STORE, WEIGHTS, WITHSCORE, WITHSCORES, RESETSTAT,
     REWRITE, RESET, FLUSH, EXISTS, LOAD, LEN, HELP, SCHEDULE, MATCH, COUNT, TYPE, KEYS, REFCOUNT,
     ENCODING, IDLETIME, FREQ, REPLACE, GETNAME, SETNAME, SETINFO, LIST, ID, KILL, PAUSE, UNPAUSE, UNBLOCK,
     STREAMS, CREATE, MKSTREAM, SETID, DESTROY, DELCONSUMER, MAXLEN, GROUP, IDLE, TIME, BLOCK, NOACK,

src/main/java/redis/clients/jedis/ScanRoundRobin.java → src/main/java/redis/clients/jedis/ScanIteration.java

@@ -1,33 +1,35 @@
 package redis.clients.jedis;
 
+import java.util.Collection;
 import java.util.function.Function;
+
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.Protocol.Keyword;
 import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.resps.ScanResult;
-import redis.clients.jedis.util.JedisRoundRobinBase;
+import redis.clients.jedis.util.JedisCommandIterationBase;
 
-public class ScanRoundRobin extends JedisRoundRobinBase<ScanResult<String>> {
+public class ScanIteration extends JedisCommandIterationBase<ScanResult<String>, String> {
 
   private final int count;
   private final Function<String, CommandArguments> args;
 
-  public ScanRoundRobin(ConnectionProvider connectionProvider, int batchCount, String match) {
+  public ScanIteration(ConnectionProvider connectionProvider, int batchCount, String match) {
     super(connectionProvider, BuilderFactory.SCAN_RESPONSE);
     this.count = batchCount;
     this.args = (cursor) -> new CommandArguments(Protocol.Command.SCAN).add(cursor)
         .add(Keyword.MATCH).add(match).add(Keyword.COUNT).add(count);
   }
 
-  public ScanRoundRobin(ConnectionProvider connectionProvider, int batchCount, String match, String type) {
+  public ScanIteration(ConnectionProvider connectionProvider, int batchCount, String match, String type) {
     super(connectionProvider, BuilderFactory.SCAN_RESPONSE);
     this.count = batchCount;
     this.args = (cursor) -> new CommandArguments(Protocol.Command.SCAN).add(cursor)
         .add(Keyword.MATCH).add(match).add(Keyword.COUNT).add(count).add(Keyword.TYPE).add(type);
   }
 
   @Override
-  protected boolean isIterationCompleted(ScanResult<String> reply) {
+  protected boolean isNodeCompleted(ScanResult<String> reply) {
     return reply.isCompleteIteration();
   }
 
@@ -40,4 +42,9 @@ protected CommandArguments initCommandArguments() {
   protected CommandArguments nextCommandArguments(ScanResult<String> lastReply) {
     return args.apply(lastReply.getCursor());
   }
+
+  @Override
+  protected Collection<String> convertBatchToData(ScanResult<String> batch) {
+    return batch.getResult();
+  }
 }

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

@@ -1025,6 +1025,16 @@ public Response<Long> zrevrank(String key, String member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(String key, String member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<String>> zrange(String key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));
@@ -2774,6 +2784,16 @@ public Response<Long> zrevrank(byte[] key, byte[] member) {
     return appendCommand(commandObjects.zrevrank(key, member));
   }
 
+  @Override
+  public Response<KeyValue<Long, Double>> zrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrankWithScore(key, member));
+  }
+
+  @Override
+  public Response<KeyValue<Long, Double>> zrevrankWithScore(byte[] key, byte[] member) {
+    return appendCommand(commandObjects.zrevrankWithScore(key, member));
+  }
+
   @Override
   public Response<List<byte[]>> zrange(byte[] key, long start, long stop) {
     return appendCommand(commandObjects.zrange(key, start, stop));