Merge branch 'Issue242' of git://github.com/ivowiblo/jedis into issue242
Conflicts: src/main/java/redis/clients/jedis/BinaryClient.java src/main/java/redis/clients/jedis/Client.java src/main/java/redis/clients/jedis/Commands.java src/main/java/redis/clients/jedis/Jedis.java src/main/java/redis/clients/jedis/ShardedJedis.java
This commit is contained in:
@@ -110,7 +110,7 @@ public interface JedisCommands {
|
||||
|
||||
Long zadd(String key, Map<Double, String> scoreMembers);
|
||||
|
||||
Set<String> zrange(String key, int start, int end);
|
||||
Set<String> zrange(String key, long start, long end);
|
||||
|
||||
Long zrem(String key, String... member);
|
||||
|
||||
@@ -120,11 +120,11 @@ public interface JedisCommands {
|
||||
|
||||
Long zrevrank(String key, String member);
|
||||
|
||||
Set<String> zrevrange(String key, int start, int end);
|
||||
Set<String> zrevrange(String key, long start, long end);
|
||||
|
||||
Set<Tuple> zrangeWithScores(String key, int start, int end);
|
||||
Set<Tuple> zrangeWithScores(String key, long start, long end);
|
||||
|
||||
Set<Tuple> zrevrangeWithScores(String key, int start, int end);
|
||||
Set<Tuple> zrevrangeWithScores(String key, long start, long end);
|
||||
|
||||
Long zcard(String key);
|
||||
|
||||
@@ -178,7 +178,7 @@ public interface JedisCommands {
|
||||
Set<Tuple> zrevrangeByScoreWithScores(String key, String max, String min,
|
||||
int offset, int count);
|
||||
|
||||
Long zremrangeByRank(String key, int start, int end);
|
||||
Long zremrangeByRank(String key, long start, long end);
|
||||
|
||||
Long zremrangeByScore(String key, double start, double end);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user