redis · sazzad16 · Mar 18, 2021 · Mar 18, 2021
diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -1582,6 +1582,10 @@ public void xlen(final byte[] key) {
     sendCommand(XLEN, key);
   }
 
+  public void xrange(final byte[] key, final byte[] start, final byte[] end) {
+    sendCommand(XRANGE, key, start, end);
+  }
+
   /**
    * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}.
    */
@@ -1594,6 +1598,10 @@ public void xrange(final byte[] key, final byte[] start, final byte[] end, final
     sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count));
   }
 
+  public void xrevrange(final byte[] key, final byte[] end, final byte[] start) {
+    sendCommand(XREVRANGE, key, end, start);
+  }
+
   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));
   }

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -4579,13 +4579,27 @@ public Long xlen(byte[] key) {
     return client.getIntegerReply();
   }
 
+  @Override
+  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {
+    checkIsInMultiOrPipeline();
+    client.xrange(key, start, end);
+    return client.getBinaryMultiBulkReply();
+  }
+
   @Override
   public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {
     checkIsInMultiOrPipeline();
     client.xrange(key, start, end, count);
     return client.getBinaryMultiBulkReply();
   }
 
+  @Override
+  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {
+    checkIsInMultiOrPipeline();
+    client.xrevrange(key, end, start);
+    return client.getBinaryMultiBulkReply();
+  }
+
   @Override
   public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     checkIsInMultiOrPipeline();

diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java
@@ -2406,6 +2406,16 @@ public Long execute(Jedis connection) {
     }.runBinary(key);
   }
 
+  @Override
+  public List<byte[]> xrange(final byte[] key, final byte[] start, final byte[] end) {
+    return new JedisClusterCommand<List<byte[]>>(connectionHandler, maxAttempts) {
+      @Override
+      public List<byte[]> execute(Jedis connection) {
+        return connection.xrange(key, start, end);
+      }
+    }.runBinary(key);
+  }
+
   @Override
   public List<byte[]> xrange(final byte[] key, final byte[] start, final byte[] end,
       final long count) {
@@ -2427,6 +2437,16 @@ public List<byte[]> execute(Jedis connection) {
     }.runBinary(key);
   }
 
+  @Override
+  public List<byte[]> xrevrange(final byte[] key, final byte[] end, final byte[] start) {
+    return new JedisClusterCommand<List<byte[]>>(connectionHandler, maxAttempts) {
+      @Override
+      public List<byte[]> execute(Jedis connection) {
+        return connection.xrevrange(key, end, start);
+      }
+    }.runBinary(key);
+  }
+
   @Override
   public List<byte[]> xrevrange(final byte[] key, final byte[] end, final byte[] start,
       final int count) {

diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
@@ -1139,12 +1139,24 @@ public Long xlen(byte[] key) {
     return j.xlen(key);
   }
 
+  @Override
+  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {
+    Jedis j = getShard(key);
+    return j.xrange(key, start, end);
+  }
+
   @Override
   public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {
     Jedis j = getShard(key);
     return j.xrange(key, start, end, count);
   }
 
+  @Override
+  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {
+    Jedis j = getShard(key);
+    return j.xrevrange(key, end, start);
+  }
+
   @Override
   public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     Jedis j = getShard(key);

diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java
@@ -1366,13 +1366,32 @@ public void xlen(final String key) {
     xlen(SafeEncoder.encode(key));
   }
 
+  @Override
+  public void xrange(final String key, final StreamEntryID start, final StreamEntryID end) {
+    xrange(SafeEncoder.encode(key), SafeEncoder.encode(start == null ? "-" : start.toString()),
+      SafeEncoder.encode(end == null ? "+" : end.toString()));
+  }
+
+  @Override
+  public void xrange(final String key, final StreamEntryID start, final StreamEntryID end,
+      final int count) {
+    xrange(SafeEncoder.encode(key), SafeEncoder.encode(start == null ? "-" : start.toString()),
+      SafeEncoder.encode(end == null ? "+" : end.toString()), count);
+  }
+
   @Override
   public void xrange(final String key, final StreamEntryID start, final StreamEntryID end,
       final long count) {
     xrange(SafeEncoder.encode(key), SafeEncoder.encode(start == null ? "-" : start.toString()),
       SafeEncoder.encode(end == null ? "+" : end.toString()), count);
   }
 
+  @Override
+  public void xrevrange(String key, StreamEntryID end, StreamEntryID start) {
+    xrevrange(SafeEncoder.encode(key), SafeEncoder.encode(end == null ? "+" : end.toString()),
+      SafeEncoder.encode(start == null ? "-" : start.toString()));
+  }
+
   @Override
   public void xrevrange(String key, StreamEntryID end, StreamEntryID start, int count) {
     xrevrange(SafeEncoder.encode(key), SafeEncoder.encode(end == null ? "+" : end.toString()),

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -4079,6 +4079,13 @@ public Long xlen(final String key) {
     return client.getIntegerReply();
   }
 
+  @Override
+  public List<StreamEntry> xrange(final String key, final StreamEntryID start, final StreamEntryID end) {
+    checkIsInMultiOrPipeline();
+    client.xrange(key, start, end);
+    return BuilderFactory.STREAM_ENTRY_LIST.build(client.getObjectMultiBulkReply());
+  }
+
   /**
    * {@inheritDoc}
    */
@@ -4090,6 +4097,14 @@ public List<StreamEntry> xrange(final String key, final StreamEntryID start,
     return BuilderFactory.STREAM_ENTRY_LIST.build(client.getObjectMultiBulkReply());
   }
 
+  @Override
+  public List<StreamEntry> xrevrange(final String key, final StreamEntryID end,
+      final StreamEntryID start) {
+    checkIsInMultiOrPipeline();
+    client.xrevrange(key, end, start);
+    return BuilderFactory.STREAM_ENTRY_LIST.build(client.getObjectMultiBulkReply());
+  }
+
   /**
    * {@inheritDoc}
    */

diff --git a/src/main/java/redis/clients/jedis/JedisCluster.java b/src/main/java/redis/clients/jedis/JedisCluster.java
@@ -2497,6 +2497,17 @@ public Long execute(Jedis connection) {
     }.run(key);
   }
 
+  @Override
+  public List<StreamEntry> xrange(final String key, final StreamEntryID start,
+      final StreamEntryID end) {
+    return new JedisClusterCommand<List<StreamEntry>>(connectionHandler, maxAttempts) {
+      @Override
+      public List<StreamEntry> execute(Jedis connection) {
+        return connection.xrange(key, start, end);
+      }
+    }.run(key);
+  }
+
   @Override
   public List<StreamEntry> xrange(final String key, final StreamEntryID start,
       final StreamEntryID end, final int count) {
@@ -2508,6 +2519,17 @@ public List<StreamEntry> execute(Jedis connection) {
     }.run(key);
   }
 
+  @Override
+  public List<StreamEntry> xrevrange(final String key, final StreamEntryID end,
+      final StreamEntryID start) {
+    return new JedisClusterCommand<List<StreamEntry>>(connectionHandler, maxAttempts) {
+      @Override
+      public List<StreamEntry> execute(Jedis connection) {
+        return connection.xrevrange(key, end, start);
+      }
+    }.run(key);
+  }
+
   @Override
   public List<StreamEntry> xrevrange(final String key, final StreamEntryID end,
       final StreamEntryID start, final int count) {

diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java
@@ -2136,6 +2136,18 @@ public Response<Long> xlen(byte[] key) {
     return getResponse(BuilderFactory.LONG);
   }
 
+  @Override
+  public Response<List<StreamEntry>> xrange(String key, StreamEntryID start, StreamEntryID end) {
+    getClient(key).xrange(key, start, end);
+    return getResponse(BuilderFactory.STREAM_ENTRY_LIST);
+  }
+
+  @Override
+  public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {
+    getClient(key).xrange(key, start, end);
+    return getResponse(BuilderFactory.BYTE_ARRAY_LIST);
+  }
+
   @Override
   public Response<List<StreamEntry>> xrange(String key, StreamEntryID start, StreamEntryID end,
       int count) {
@@ -2149,6 +2161,18 @@ public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int c
     return getResponse(BuilderFactory.BYTE_ARRAY_LIST);
   }
 
+  @Override
+  public Response<List<StreamEntry>> xrevrange(String key, StreamEntryID end, StreamEntryID start) {
+    getClient(key).xrevrange(key, end, start);
+    return getResponse(BuilderFactory.STREAM_ENTRY_LIST);
+  }
+
+  @Override
+  public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {
+    getClient(key).xrevrange(key, end, start);
+    return getResponse(BuilderFactory.BYTE_ARRAY_LIST);
+  }
+
   @Override
   public Response<List<StreamEntry>> xrevrange(String key, StreamEntryID end, StreamEntryID start,
       int count) {

diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java
@@ -1135,6 +1135,12 @@ public Long xlen(String key) {
     return j.xlen(key);
   }
 
+  @Override
+  public List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end) {
+    Jedis j = getShard(key);
+    return j.xrange(key, start, end);
+  }
+
   @Override
   public List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end, int count) {
     Jedis j = getShard(key);
@@ -1183,6 +1189,12 @@ public long xtrim(String key, long maxLen, boolean approximateLength) {
     return j.xtrim(key, maxLen, approximateLength);
   }
 
+  @Override
+  public List<StreamEntry> xrevrange(String key, StreamEntryID end, StreamEntryID start) {
+    Jedis j = getShard(key);
+    return j.xrevrange(key, end, start);
+  }
+
   @Override
   public List<StreamEntry> xrevrange(String key, StreamEntryID end, StreamEntryID start, int count) {
     Jedis j = getShard(key);

diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java
@@ -387,6 +387,8 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(byte[] key, byte[] member, dou
 
   Long xlen(byte[] key);
 
+  List<byte[]> xrange(byte[] key, byte[] start, byte[] end);
+
   /**
    * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}.
    */
@@ -395,6 +397,8 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(byte[] key, byte[] member, dou
 
   List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count);
 
+  List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start);
+
   List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count);
 
   Long xack(byte[] key, byte[] group, byte[]... ids);

diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java
@@ -415,6 +415,8 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(byte[] key, byte[] member, dou
 
   Long xlen(byte[] key);
 
+  List<byte[]> xrange(byte[] key, byte[] start, byte[] end);
+
   /**
    * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}.
    */
@@ -425,6 +427,8 @@ default List<byte[]> xrange(byte[] key, byte[] start, byte[] end, long count) {
 
   List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count);
 
+  List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start);
+
   List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count);
 
   Long xack(byte[] key, byte[] group, byte[]... ids);

diff --git a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java
@@ -385,8 +385,12 @@ Response<List<GeoRadiusResponse>> georadiusByMemberReadonly(byte[] key, byte[] m
 
   Response<Long> xlen(byte[] key);
 
+  Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end);
+
   Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count);
 
+  Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start);
+
   Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count);
 
   Response<Long> xack(byte[] key, byte[] group,  byte[]... ids);

diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java
@@ -447,8 +447,18 @@ default void restoreReplace(String key, int ttl, byte[] serializedValue) {
 
   void xlen(String key);
 
+  void xrange(String key, StreamEntryID start, StreamEntryID end);
+
+  void xrange(String key, StreamEntryID start, StreamEntryID end, int count);
+
+  /**
+   * @deprecated Use {@link #xrange(java.lang.String, redis.clients.jedis.StreamEntryID, redis.clients.jedis.StreamEntryID, int)}.
+   */
+  @Deprecated
   void xrange(String key, StreamEntryID start, StreamEntryID end, long count);
 
+  void xrevrange(String key, StreamEntryID end, StreamEntryID start);
+
   void xrevrange(String key, StreamEntryID end, StreamEntryID start, int count);
 
   /**

diff --git a/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java
@@ -442,7 +442,17 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(String key, String member, dou
   Long xlen(String key);
 
   /**
-   * XRANGE key start end [COUNT count]
+   * XRANGE key start end
+   *
+   * @param key
+   * @param start
+   * @param end
+   * @return
+   */
+  List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end);
+
+  /**
+   * XRANGE key start end COUNT count
    *
    * @param key
    * @param start
@@ -453,7 +463,16 @@ List<GeoRadiusResponse> georadiusByMemberReadonly(String key, String member, dou
   List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end, int count);
 
   /**
-   * XREVRANGE key end start [COUNT <n>]
+   * XREVRANGE key end start
+   * @param key
+   * @param end
+   * @param start
+   * @return
+   */
+  List<StreamEntry> xrevrange(String key, StreamEntryID end, StreamEntryID start);
+
+  /**
+   * XREVRANGE key end start COUNT count
    * @param key
    * @param end
    * @param start