Merge remote-tracking branch 'redis/master' into xread-block-2

Author: sazzad16

.github/workflows/release-drafter.yml

@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+          # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+           config-name: release-drafter-config.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

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

@@ -189,6 +189,10 @@ public void getDel(final byte[] key) {
     sendCommand(GETDEL, key);
   }
 
+  public void getEx(final byte[] key, final GetExParams params) {
+    sendCommand(GETEX, params.getByteParams(key));
+  }
+
   public void quit() {
     db = 0;
     sendCommand(QUIT);
@@ -559,6 +563,10 @@ public void zadd(final byte[] key, final Map<byte[], Double> scoreMembers, final
     sendCommand(ZADD, params.getByteParams(key, argsArray));
   }
 
+  public void zaddIncr(final byte[] key, final double score, final byte[] member, final ZAddParams params) {
+    sendCommand(ZADD, params.getByteParams(key, INCR.getRaw(), toByteArray(score), member));
+  }
+
   public void zrange(final byte[] key, final long start, final long stop) {
     sendCommand(ZRANGE, key, toByteArray(start), toByteArray(stop));
   }
@@ -675,6 +683,22 @@ public void blpop(final int timeout, final byte[]... keys) {
     blpop(args.toArray(new byte[args.size()][]));
   }
 
+  public void bzpopmax(final int timeout, final byte[]... keys) {
+    final List<byte[]> args = new ArrayList<>();
+    Collections.addAll(args, keys);
+
+    args.add(Protocol.toByteArray(timeout));
+    sendCommand(BZPOPMAX, args.toArray(new byte[args.size()][]));
+  }
+
+  public void bzpopmin(final int timeout, final byte[]... keys) {
+    final List<byte[]> args = new ArrayList<>();
+    Collections.addAll(args, keys);
+
+    args.add(Protocol.toByteArray(timeout));
+    sendCommand(BZPOPMIN, args.toArray(new byte[args.size()][]));
+  }
+
   public void sort(final byte[] key, final SortingParams sortingParameters, final byte[] dstkey) {
     final List<byte[]> args = new ArrayList<>();
     args.add(key);
@@ -1296,14 +1320,17 @@ public void geoadd(final byte[] key, final double longitude, final double latitu
   }
 
   public void geoadd(final byte[] key, final Map<byte[], GeoCoordinate> memberCoordinateMap) {
-    List<byte[]> args = new ArrayList<>(memberCoordinateMap.size() * 3 + 1);
-    args.add(key);
+    geoadd(key, GeoAddParams.geoAddParams(), memberCoordinateMap);
+  }
+
+  public void geoadd(final byte[] key, final GeoAddParams params, final Map<byte[], GeoCoordinate> memberCoordinateMap) {
+    List<byte[]> args = new ArrayList<>(memberCoordinateMap.size() * 3);
     args.addAll(convertGeoCoordinateMapToByteArrays(memberCoordinateMap));
 
     byte[][] argsArray = new byte[args.size()][];
     args.toArray(argsArray);
 
-    sendCommand(GEOADD, argsArray);
+    sendCommand(GEOADD, params.getByteParams(key, argsArray));
   }
 
   public void geodist(final byte[] key, final byte[] member1, final byte[] member2) {
@@ -1456,6 +1483,14 @@ public void aclDelUser(final byte[] name) {
     sendCommand(ACL, Keyword.DELUSER.getRaw(), name);
   }
 
+  public void aclLoad() {
+    sendCommand(ACL, Keyword.LOAD.getRaw());
+  }
+
+  public void aclSave() {
+    sendCommand(ACL, Keyword.SAVE.getRaw());
+  }
+
   private List<byte[]> convertGeoCoordinateMapToByteArrays(
       final Map<byte[], GeoCoordinate> memberCoordinateMap) {
     List<byte[]> args = new ArrayList<>(memberCoordinateMap.size() * 3);
@@ -1697,6 +1732,10 @@ public void xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int
     }
   }
 
+  public void xpendingSummary(final byte[] key, final byte[] groupname) {
+    sendCommand(XPENDING, key, groupname);
+  }
+
   public void xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime,
       long newIdleTime, int retries, boolean force, byte[][] ids) {
 

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

@@ -407,6 +407,13 @@ public byte[] getDel(final byte[] key) {
     return client.getBinaryBulkReply();
   }
 
+  @Override
+  public byte[] getEx(final byte[] key, final GetExParams params) {
+    checkIsInMultiOrPipeline();
+    client.getEx(key, params);
+    return client.getBinaryBulkReply();
+  }
+
   /**
    * Ask the server to silently close the connection.
    */
@@ -1834,14 +1841,14 @@ public Long sunionstore(final byte[] dstkey, final byte[]... keys) {
    * Return the difference between the Set stored at key1 and all the Sets key2, ..., keyN
    * <p>
    * <b>Example:</b>
-   * 
+   *
    * <pre>
    * key1 = [x, a, b, c]
    * key2 = [c]
    * key3 = [a, d]
    * SDIFF key1,key2,key3 =&gt; [x, b]
    * </pre>
-   * 
+   *
    * Non existing keys are considered like empty sets.
    * <p>
    * <b>Time complexity:</b>
@@ -1941,6 +1948,13 @@ public Long zadd(final byte[] key, final Map<byte[], Double> scoreMembers, final
     return client.getIntegerReply();
   }
 
+  @Override
+  public Double zaddIncr(final byte[] key, final double score, final byte[] member, final ZAddParams params) {
+    checkIsInMultiOrPipeline();
+    client.zaddIncr(key, score, member, params);
+    return BuilderFactory.DOUBLE.build(client.getOne());
+  }
+
   @Override
   public Set<byte[]> zrange(final byte[] key, final long start, final long stop) {
     checkIsInMultiOrPipeline();
@@ -2199,65 +2213,65 @@ public List<byte[]> sort(final byte[] key) {
    * <b>examples:</b>
    * <p>
    * Given are the following sets and key/values:
-   * 
+   *
    * <pre>
    * x = [1, 2, 3]
    * y = [a, b, c]
-   * 
+   *
    * k1 = z
    * k2 = y
    * k3 = x
-   * 
+   *
    * w1 = 9
    * w2 = 8
    * w3 = 7
    * </pre>
-   * 
+   *
    * Sort Order:
-   * 
+   *
    * <pre>
    * sort(x) or sort(x, sp.asc())
    * -&gt; [1, 2, 3]
-   * 
+   *
    * sort(x, sp.desc())
    * -&gt; [3, 2, 1]
-   * 
+   *
    * sort(y)
    * -&gt; [c, a, b]
-   * 
+   *
    * sort(y, sp.alpha())
    * -&gt; [a, b, c]
-   * 
+   *
    * sort(y, sp.alpha().desc())
    * -&gt; [c, a, b]
    * </pre>
-   * 
+   *
    * Limit (e.g. for Pagination):
-   * 
+   *
    * <pre>
    * sort(x, sp.limit(0, 2))
    * -&gt; [1, 2]
-   * 
+   *
    * sort(y, sp.alpha().desc().limit(1, 2))
    * -&gt; [b, a]
    * </pre>
-   * 
+   *
    * Sorting by external keys:
-   * 
+   *
    * <pre>
    * sort(x, sb.by(w*))
    * -&gt; [3, 2, 1]
-   * 
+   *
    * sort(x, sb.by(w*).desc())
    * -&gt; [1, 2, 3]
    * </pre>
-   * 
+   *
    * Getting external keys:
-   * 
+   *
    * <pre>
    * sort(x, sp.by(w*).get(k*))
    * -&gt; [x, y, z]
-   * 
+   *
    * sort(x, sp.by(w*).get(#).get(k*))
    * -&gt; [3, x, 2, y, 1, z]
    * </pre>
@@ -2341,6 +2355,20 @@ public List<byte[]> blpop(final int timeout, final byte[]... keys) {
     return blpop(getArgsAddTimeout(timeout, keys));
   }
 
+  @Override
+  public KeyedTuple bzpopmax(final int timeout, final byte[]... keys) {
+    checkIsInMultiOrPipeline();
+    client.bzpopmax(timeout, keys);
+    return BuilderFactory.KEYED_TUPLE.build(client.getBinaryMultiBulkReply());
+  }
+
+  @Override
+  public KeyedTuple bzpopmin(final int timeout, final byte[]... keys) {
+    checkIsInMultiOrPipeline();
+    client.bzpopmin(timeout, keys);
+    return BuilderFactory.KEYED_TUPLE.build(client.getBinaryMultiBulkReply());
+  }
+
   private byte[][] getArgsAddTimeout(int timeout, byte[][] keys) {
     int size = keys.length;
     final byte[][] args = new byte[size + 1][];
@@ -3192,7 +3220,7 @@ public String shutdown() {
    * <b>Format of the returned String:</b>
    * <p>
    * All the fields are in the form field:value
-   * 
+   *
    * <pre>
    * edis_version:0.07
    * connected_clients:1
@@ -3205,7 +3233,7 @@ public String shutdown() {
    * uptime_in_seconds:25
    * uptime_in_days:0
    * </pre>
-   * 
+   *
    * <b>Notes</b>
    * <p>
    * used_memory is returned in bytes, and is the total number of bytes allocated by the program
@@ -3287,7 +3315,7 @@ public String slaveofNoOne() {
    * are reported as a list of key-value pairs.
    * <p>
    * <b>Example:</b>
-   * 
+   *
    * <pre>
    * $ redis-cli config get '*'
    * 1. "dbfilename"
@@ -3302,7 +3330,7 @@ public String slaveofNoOne() {
    * 10. "everysec"
    * 11. "save"
    * 12. "3600 1 300 100 60 10000"
-   * 
+   *
    * $ redis-cli config get 'm*'
    * 1. "masterauth"
    * 2. (nil)
@@ -3934,6 +3962,20 @@ public byte[] aclLog(byte[] options) {
     return client.getBinaryBulkReply();
   }
 
+  @Override
+  public String aclLoad() {
+    checkIsInMultiOrPipeline();
+    client.aclLoad();
+    return client.getStatusCodeReply();
+  }
+
+  @Override
+  public String aclSave() {
+    checkIsInMultiOrPipeline();
+    client.aclSave();
+    return client.getStatusCodeReply();
+  }
+
   @Override
   public String clientKill(final byte[] ipPort) {
     checkIsInMultiOrPipeline();
@@ -4135,6 +4177,13 @@ public Long geoadd(final byte[] key, final Map<byte[], GeoCoordinate> memberCoor
     return client.getIntegerReply();
   }
 
+  @Override
+  public Long geoadd(final byte[] key, final GeoAddParams params, final Map<byte[], GeoCoordinate> memberCoordinateMap) {
+    checkIsInMultiOrPipeline();
+    client.geoadd(key, params, memberCoordinateMap);
+    return client.getIntegerReply();
+  }
+
   @Override
   public Double geodist(final byte[] key, final byte[] member1, final byte[] member2) {
     checkIsInMultiOrPipeline();
@@ -4519,6 +4568,13 @@ public List<Object> xpending(byte[] key, byte[] groupname, byte[] start, byte[]
     return client.getObjectMultiBulkReply();
   }
 
+  @Override
+  public Object xpendingSummary(final byte[] key, final byte[] groupname) {
+    checkIsInMultiOrPipeline();
+    client.xpendingSummary(key, groupname);
+    return client.getOne();
+  }
+
   @Override
   public List<byte[]> xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime,
       long newIdleTime, int retries, boolean force, byte[]... ids) {