rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Issue242' of git://github.com/ivowiblo/jedis into issue242

Browse Source 
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:
Jonathan Leibiusky
2012-05-06 19:47:00 -03:00
parent 457cccc9c4 088f84b6b2
commit 4f5acab0fb
7 changed files with 177 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/redis/clients/jedis/BinaryClient.java
View File

@@ -2,15 +2,15 @@ package redis.clients.jedis;
import static redis.clients.jedis.Protocol.toByteArray;
import static redis.clients.jedis.Protocol.Command.*;
import static redis.clients.jedis.Protocol.Keyword.ENCODING;
import static redis.clients.jedis.Protocol.Keyword.IDLETIME;
import static redis.clients.jedis.Protocol.Keyword.LEN;
import static redis.clients.jedis.Protocol.Keyword.LIMIT;
import static redis.clients.jedis.Protocol.Keyword.NO;
import static redis.clients.jedis.Protocol.Keyword.ONE;
import static redis.clients.jedis.Protocol.Keyword.REFCOUNT;
import static redis.clients.jedis.Protocol.Keyword.RESET;
import static redis.clients.jedis.Protocol.Keyword.STORE;
import static redis.clients.jedis.Protocol.Keyword.REFCOUNT;
import static redis.clients.jedis.Protocol.Keyword.ENCODING;
import static redis.clients.jedis.Protocol.Keyword.IDLETIME;
import static redis.clients.jedis.Protocol.Keyword.WITHSCORES;
import java.util.ArrayList;
@@ -393,7 +393,7 @@ public class BinaryClient extends Connection {
sendCommand(ZADD, argsArray);
}
public void zrange(final byte[] key, final int start, final int end) {
public void zrange(final byte[] key, final long start, final long end) {
sendCommand(ZRANGE, key, toByteArray(start), toByteArray(end));
}
@@ -414,18 +414,18 @@ public class BinaryClient extends Connection {
sendCommand(ZREVRANK, key, member);
}
public void zrevrange(final byte[] key, final int start, final int end) {
public void zrevrange(final byte[] key, final long start, final long end) {
sendCommand(ZREVRANGE, key, toByteArray(start), toByteArray(end));
}
public void zrangeWithScores(final byte[] key, final int start,
final int end) {
public void zrangeWithScores(final byte[] key, final long start,
final long end) {
sendCommand(ZRANGE, key, toByteArray(start), toByteArray(end),
WITHSCORES.raw);
}
public void zrevrangeWithScores(final byte[] key, final int start,
final int end) {
public void zrevrangeWithScores(final byte[] key, final long start,
final long end) {
sendCommand(ZREVRANGE, key, toByteArray(start), toByteArray(end),
WITHSCORES.raw);
}
@@ -543,43 +543,40 @@ public class BinaryClient extends Connection {
public void zrangeByScore(final byte[] key, final byte[] min,
final byte[] max, final int offset, int count) {
sendCommand(ZRANGEBYSCORE, key, min, max,
LIMIT.raw, toByteArray(offset), toByteArray(count));
sendCommand(ZRANGEBYSCORE, key, min, max, LIMIT.raw,
toByteArray(offset), toByteArray(count));
}
public void zrevrangeByScore(final byte[] key, final byte[] max,
final byte[] min, final int offset, int count) {
sendCommand(ZREVRANGEBYSCORE, key, max, min,
LIMIT.raw, toByteArray(offset), toByteArray(count));
sendCommand(ZREVRANGEBYSCORE, key, max, min, LIMIT.raw,
toByteArray(offset), toByteArray(count));
}
public void zrangeByScoreWithScores(final byte[] key, final byte[] min,
final byte[] max) {
sendCommand(ZRANGEBYSCORE, key, min, max,
WITHSCORES.raw);
sendCommand(ZRANGEBYSCORE, key, min, max, WITHSCORES.raw);
}
public void zrevrangeByScoreWithScores(final byte[] key, final byte[] max,
final byte[] min) {
sendCommand(ZREVRANGEBYSCORE, key, max, min,
WITHSCORES.raw);
sendCommand(ZREVRANGEBYSCORE, key, max, min, WITHSCORES.raw);
}
public void zrangeByScoreWithScores(final byte[] key, final byte[] min,
final byte[] max, final int offset, final int count) {
sendCommand(ZRANGEBYSCORE, key, min, max,
LIMIT.raw, toByteArray(offset), toByteArray(count),
WITHSCORES.raw);
sendCommand(ZRANGEBYSCORE, key, min, max, LIMIT.raw,
toByteArray(offset), toByteArray(count), WITHSCORES.raw);
}
public void zrevrangeByScoreWithScores(final byte[] key, final byte[] max,
final byte[] min, final int offset, final int count) {
sendCommand(ZREVRANGEBYSCORE, key, max, min,
LIMIT.raw, toByteArray(offset), toByteArray(count),
WITHSCORES.raw);
sendCommand(ZREVRANGEBYSCORE, key, max, min, LIMIT.raw,
toByteArray(offset), toByteArray(count), WITHSCORES.raw);
}
public void zremrangeByRank(final byte[] key, final int start, final int end) {
public void zremrangeByRank(final byte[] key, final long start,
final long end) {
sendCommand(ZREMRANGEBYRANK, key, toByteArray(start), toByteArray(end));
}
@@ -798,16 +795,16 @@ public class BinaryClient extends Connection {
public void slowlogLen() {
sendCommand(SLOWLOG, LEN.raw);
}
public void objectRefcount(byte[] key) {
sendCommand(OBJECT, REFCOUNT.raw, key);
}
public void objectIdletime(byte[] key) {
sendCommand(OBJECT, IDLETIME.raw, key);
}
public void objectEncoding(byte[] key) {
sendCommand(OBJECT, ENCODING.raw, key);
}
sendCommand(OBJECT, REFCOUNT.raw, key);
}
public void objectIdletime(byte[] key) {
sendCommand(OBJECT, IDLETIME.raw, key);
}
public void objectEncoding(byte[] key) {
sendCommand(OBJECT, ENCODING.raw, key);
}
}

118
src/main/java/redis/clients/jedis/Client.java
View File

@@ -319,7 +319,7 @@ public class Client extends BinaryClient implements Commands {
zadd(SafeEncoder.encode(key), score, SafeEncoder.encode(member));
}
public void zrange(final String key, final int start, final int end) {
public void zrange(final String key, final long start, final long end) {
zrange(SafeEncoder.encode(key), start, end);
}
@@ -340,17 +340,17 @@ public class Client extends BinaryClient implements Commands {
zrevrank(SafeEncoder.encode(key), SafeEncoder.encode(member));
}
public void zrevrange(final String key, final int start, final int end) {
public void zrevrange(final String key, final long start, final long end) {
zrevrange(SafeEncoder.encode(key), start, end);
}
public void zrangeWithScores(final String key, final int start,
final int end) {
public void zrangeWithScores(final String key, final long start,
final long end) {
zrangeWithScores(SafeEncoder.encode(key), start, end);
}
public void zrevrangeWithScores(final String key, final int start,
final int end) {
public void zrevrangeWithScores(final String key, final long start,
final long end) {
zrevrangeWithScores(SafeEncoder.encode(key), start, end);
}
@@ -407,14 +407,16 @@ public class Client extends BinaryClient implements Commands {
public void zcount(final String key, final double min, final double max) {
zcount(SafeEncoder.encode(key), toByteArray(min), toByteArray(max));
}
public void zcount(final String key, final String min, final String max) {
zcount(SafeEncoder.encode(key), SafeEncoder.encode(min), SafeEncoder.encode(max));
zcount(SafeEncoder.encode(key), SafeEncoder.encode(min),
SafeEncoder.encode(max));
}
public void zrangeByScore(final String key, final double min,
final double max) {
zrangeByScore(SafeEncoder.encode(key), toByteArray(min), toByteArray(max));
zrangeByScore(SafeEncoder.encode(key), toByteArray(min),
toByteArray(max));
}
public void zrangeByScore(final String key, final String min,
@@ -425,39 +427,44 @@ public class Client extends BinaryClient implements Commands {
public void zrangeByScore(final String key, final double min,
final double max, final int offset, int count) {
zrangeByScore(SafeEncoder.encode(key), toByteArray(min), toByteArray(max), offset, count);
zrangeByScore(SafeEncoder.encode(key), toByteArray(min),
toByteArray(max), offset, count);
}
public void zrangeByScoreWithScores(final String key, final double min,
final double max) {
zrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(min), toByteArray(max));
zrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(min),
toByteArray(max));
}
public void zrangeByScoreWithScores(final String key, final double min,
final double max, final int offset, final int count) {
zrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(min), toByteArray(max), offset,
count);
zrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(min),
toByteArray(max), offset, count);
}
public void zrevrangeByScore(final String key, final double max,
final double min) {
zrevrangeByScore(SafeEncoder.encode(key), toByteArray(max), toByteArray(min));
zrevrangeByScore(SafeEncoder.encode(key), toByteArray(max),
toByteArray(min));
}
public void zrangeByScore(final String key, final String min,
final String max, final int offset, int count) {
zrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(min), SafeEncoder.encode(max), offset, count);
zrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(min),
SafeEncoder.encode(max), offset, count);
}
public void zrangeByScoreWithScores(final String key, final String min,
final String max) {
zrangeByScoreWithScores(SafeEncoder.encode(key), SafeEncoder.encode(min), SafeEncoder.encode(max));
zrangeByScoreWithScores(SafeEncoder.encode(key),
SafeEncoder.encode(min), SafeEncoder.encode(max));
}
public void zrangeByScoreWithScores(final String key, final String min,
final String max, final int offset, final int count) {
zrangeByScoreWithScores(SafeEncoder.encode(key), SafeEncoder.encode(min), SafeEncoder.encode(max), offset,
count);
zrangeByScoreWithScores(SafeEncoder.encode(key),
SafeEncoder.encode(min), SafeEncoder.encode(max), offset, count);
}
public void zrevrangeByScore(final String key, final String max,
@@ -468,49 +475,56 @@ public class Client extends BinaryClient implements Commands {
public void zrevrangeByScore(final String key, final double max,
final double min, final int offset, int count) {
zrevrangeByScore(SafeEncoder.encode(key), toByteArray(max), toByteArray(min), offset, count);
zrevrangeByScore(SafeEncoder.encode(key), toByteArray(max),
toByteArray(min), offset, count);
}
public void zrevrangeByScore(final String key, final String max,
final String min, final int offset, int count) {
zrevrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(max), SafeEncoder.encode(min), offset, count);
final String min, final int offset, int count) {
zrevrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(max),
SafeEncoder.encode(min), offset, count);
}
public void zrevrangeByScoreWithScores(final String key, final double max,
final double min) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(max), toByteArray(min));
zrevrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(max),
toByteArray(min));
}
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key), SafeEncoder.encode(max), SafeEncoder.encode(min));
}
final String min) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key),
SafeEncoder.encode(max), SafeEncoder.encode(min));
}
public void zrevrangeByScoreWithScores(final String key, final double max,
final double min, final int offset, final int count) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(max), toByteArray(min), offset,
count);
zrevrangeByScoreWithScores(SafeEncoder.encode(key), toByteArray(max),
toByteArray(min), offset, count);
}
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min, final int offset, final int count) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key), SafeEncoder.encode(max), SafeEncoder.encode(min), offset,
count);
}
public void zremrangeByRank(final String key, final int start, final int end) {
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min, final int offset, final int count) {
zrevrangeByScoreWithScores(SafeEncoder.encode(key),
SafeEncoder.encode(max), SafeEncoder.encode(min), offset, count);
}
public void zremrangeByRank(final String key, final long start,
final long end) {
zremrangeByRank(SafeEncoder.encode(key), start, end);
}
public void zremrangeByScore(final String key, final double start,
final double end) {
zremrangeByScore(SafeEncoder.encode(key), toByteArray(start), toByteArray(end));
zremrangeByScore(SafeEncoder.encode(key), toByteArray(start),
toByteArray(end));
}
public void zremrangeByScore(final String key, final String start,
final String end) {
zremrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(start), SafeEncoder.encode(end));
}
final String end) {
zremrangeByScore(SafeEncoder.encode(key), SafeEncoder.encode(start),
SafeEncoder.encode(end));
}
public void zunionstore(final String dstkey, final String... sets) {
final byte[][] bsets = new byte[sets.length][];
@@ -678,15 +692,15 @@ public class Client extends BinaryClient implements Commands {
zaddBinary(SafeEncoder.encode(key), binaryScoreMembers);
}
public void objectRefcount(String key) {
objectRefcount(SafeEncoder.encode(key));
}
public void objectIdletime(String key) {
objectIdletime(SafeEncoder.encode(key));
}
public void objectEncoding(String key) {
objectEncoding(SafeEncoder.encode(key));
}
public void objectRefcount(String key) {
objectRefcount(SafeEncoder.encode(key));
}
public void objectIdletime(String key) {
objectIdletime(SafeEncoder.encode(key));
}
public void objectEncoding(String key) {
objectEncoding(SafeEncoder.encode(key));
}
}

37
src/main/java/redis/clients/jedis/Commands.java
View File

@@ -141,7 +141,7 @@ public interface Commands {
public void zadd(final String key, final Map<Double, String> scoreMembers);
public void zrange(final String key, final int start, final int end);
public void zrange(final String key, final long start, final long end);
public void zrem(final String key, final String... members);
@@ -152,13 +152,13 @@ public interface Commands {
public void zrevrank(final String key, final String member);
public void zrevrange(final String key, final int start, final int end);
public void zrevrange(final String key, final long start, final long end);
public void zrangeWithScores(final String key, final int start,
final int end);
public void zrangeWithScores(final String key, final long start,
final long end);
public void zrevrangeWithScores(final String key, final int start,
final int end);
public void zrevrangeWithScores(final String key, final long start,
final long end);
public void zcard(final String key);
@@ -183,7 +183,7 @@ public interface Commands {
final int timeout);
public void zcount(final String key, final double min, final double max);
public void zcount(final String key, final String min, final String max);
public void zrangeByScore(final String key, final double min,
@@ -202,12 +202,12 @@ public interface Commands {
final double max, final int offset, final int count);
public void zrangeByScoreWithScores(final String key, final String min,
final String max);
final String max);
public void zrangeByScoreWithScores(final String key, final String min,
final String max, final int offset, final int count);
public void zrangeByScoreWithScores(final String key, final String min,
final String max, final int offset, final int count);
public void zrevrangeByScore(final String key, final double max,
public void zrevrangeByScore(final String key, final double max,
final double min);
public void zrevrangeByScore(final String key, final String max,
@@ -221,21 +221,22 @@ public interface Commands {
public void zrevrangeByScoreWithScores(final String key, final double max,
final double min, final int offset, final int count);
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min);
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min, final int offset, final int count);
final String min);
public void zremrangeByRank(final String key, final int start, final int end);
public void zrevrangeByScoreWithScores(final String key, final String max,
final String min, final int offset, final int count);
public void zremrangeByRank(final String key, final long start,
final long end);
public void zremrangeByScore(final String key, final double start,
final double end);
public void zremrangeByScore(final String key, final String start,
final String end);
final String end);
public void zunionstore(final String dstkey, final String... sets);
public void zunionstore(final String dstkey, final ZParams params,

1
src/main/java/redis/clients/jedis/Connection.java
View File

@@ -112,6 +112,7 @@ public class Connection {
}
public Connection() {
}
public void connect() {

73
src/main/java/redis/clients/jedis/Jedis.java
View File

@@ -1445,7 +1445,7 @@ public class Jedis extends BinaryJedis implements JedisCommands {
return client.getIntegerReply();
}
public Set<String> zrange(final String key, final int start, final int end) {
public Set<String> zrange(final String key, final long start, final long end) {
checkIsInMulti();
client.zrange(key, start, end);
final List<String> members = client.getMultiBulkReply();
@@ -1557,24 +1557,24 @@ public class Jedis extends BinaryJedis implements JedisCommands {
return client.getIntegerReply();
}
public Set<String> zrevrange(final String key, final int start,
final int end) {
public Set<String> zrevrange(final String key, final long start,
final long end) {
checkIsInMulti();
client.zrevrange(key, start, end);
final List<String> members = client.getMultiBulkReply();
return new LinkedHashSet<String>(members);
}
public Set<Tuple> zrangeWithScores(final String key, final int start,
final int end) {
public Set<Tuple> zrangeWithScores(final String key, final long start,
final long end) {
checkIsInMulti();
client.zrangeWithScores(key, start, end);
Set<Tuple> set = getTupledSet();
return set;
}
public Set<Tuple> zrevrangeWithScores(final String key, final int start,
final int end) {
public Set<Tuple> zrevrangeWithScores(final String key, final long start,
final long end) {
checkIsInMulti();
client.zrevrangeWithScores(key, start, end);
Set<Tuple> set = getTupledSet();
@@ -1991,11 +1991,11 @@ public class Jedis extends BinaryJedis implements JedisCommands {
client.zcount(key, min, max);
return client.getIntegerReply();
}
public Long zcount(final String key, final String min, final String max) {
checkIsInMulti();
client.zcount(key, min, max);
return client.getIntegerReply();
checkIsInMulti();
client.zcount(key, min, max);
return client.getIntegerReply();
}
/**
@@ -2131,9 +2131,9 @@ public class Jedis extends BinaryJedis implements JedisCommands {
client.zrangeByScore(key, min, max, offset, count);
return new LinkedHashSet<String>(client.getMultiBulkReply());
}
public Set<String> zrangeByScore(final String key, final String min,
final String max, final int offset, final int count) {
final String max, final int offset, final int count) {
checkIsInMulti();
client.zrangeByScore(key, min, max, offset, count);
return new LinkedHashSet<String>(client.getMultiBulkReply());
@@ -2202,14 +2202,14 @@ public class Jedis extends BinaryJedis implements JedisCommands {
Set<Tuple> set = getTupledSet();
return set;
}
public Set<Tuple> zrangeByScoreWithScores(final String key,
final String min, final String max) {
checkIsInMulti();
client.zrangeByScoreWithScores(key, min, max);
Set<Tuple> set = getTupledSet();
return set;
}
final String min, final String max) {
checkIsInMulti();
client.zrangeByScoreWithScores(key, min, max);
Set<Tuple> set = getTupledSet();
return set;
}
/**
* Return the all the elements in the sorted set at key with a score between
@@ -2275,15 +2275,15 @@ public class Jedis extends BinaryJedis implements JedisCommands {
Set<Tuple> set = getTupledSet();
return set;
}
public Set<Tuple> zrangeByScoreWithScores(final String key,
final String min, final String max, final int offset,
final int count) {
checkIsInMulti();
client.zrangeByScoreWithScores(key, min, max, offset, count);
Set<Tuple> set = getTupledSet();
return set;
}
final String min, final String max, final int offset,
final int count) {
checkIsInMulti();
client.zrangeByScoreWithScores(key, min, max, offset, count);
Set<Tuple> set = getTupledSet();
return set;
}
private Set<Tuple> getTupledSet() {
checkIsInMulti();
@@ -2333,7 +2333,7 @@ public class Jedis extends BinaryJedis implements JedisCommands {
Set<Tuple> set = getTupledSet();
return set;
}
public Set<Tuple> zrevrangeByScoreWithScores(final String key,
final String max, final String min, final int offset,
final int count) {
@@ -2371,7 +2371,8 @@ public class Jedis extends BinaryJedis implements JedisCommands {
* operation
*
*/
public Long zremrangeByRank(final String key, final int start, final int end) {
public Long zremrangeByRank(final String key, final long start,
final long end) {
checkIsInMulti();
client.zremrangeByRank(key, start, end);
return client.getIntegerReply();
@@ -2397,13 +2398,13 @@ public class Jedis extends BinaryJedis implements JedisCommands {
client.zremrangeByScore(key, start, end);
return client.getIntegerReply();
}
public Long zremrangeByScore(final String key, final String start,
final String end) {
checkIsInMulti();
client.zremrangeByScore(key, start, end);
return client.getIntegerReply();
}
final String end) {
checkIsInMulti();
client.zremrangeByScore(key, start, end);
return client.getIntegerReply();
}
/**
* Creates a union or intersection of N sorted sets given by keys k1 through

10
src/main/java/redis/clients/jedis/JedisCommands.java
View File

@@ -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);

34
src/main/java/redis/clients/jedis/ShardedJedis.java
View File

@@ -207,15 +207,15 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
Jedis j = getShard(key);
return j.lpush(key, strings);
}
public Long lpushx(String key, String string) {
Jedis j = getShard(key);
return j.lpushx(key, string);
Jedis j = getShard(key);
return j.lpushx(key, string);
}
public Long rpushx(String key, String string) {
Jedis j = getShard(key);
return j.rpushx(key, string);
Jedis j = getShard(key);
return j.rpushx(key, string);
}
public Long llen(String key) {
@@ -303,7 +303,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
return j.zadd(key, scoreMembers);
}
public Set<String> zrange(String key, int start, int end) {
public Set<String> zrange(String key, long start, long end) {
Jedis j = getShard(key);
return j.zrange(key, start, end);
}
@@ -328,17 +328,17 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
return j.zrevrank(key, member);
}
public Set<String> zrevrange(String key, int start, int end) {
public Set<String> zrevrange(String key, long start, long end) {
Jedis j = getShard(key);
return j.zrevrange(key, start, end);
}
public Set<Tuple> zrangeWithScores(String key, int start, int end) {
public Set<Tuple> zrangeWithScores(String key, long start, long end) {
Jedis j = getShard(key);
return j.zrangeWithScores(key, start, end);
}
public Set<Tuple> zrevrangeWithScores(String key, int start, int end) {
public Set<Tuple> zrevrangeWithScores(String key, long start, long end) {
Jedis j = getShard(key);
return j.zrevrangeWithScores(key, start, end);
}
@@ -367,7 +367,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
Jedis j = getShard(key);
return j.zcount(key, min, max);
}
public Long zcount(String key, String min, String max) {
Jedis j = getShard(key);
return j.zcount(key, min, max);
@@ -417,7 +417,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
Jedis j = getShard(key);
return j.zrevrangeByScoreWithScores(key, max, min, offset, count);
}
public Set<String> zrangeByScore(String key, String min, String max) {
Jedis j = getShard(key);
return j.zrangeByScore(key, min, max);
@@ -446,24 +446,24 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
}
public Set<Tuple> zrevrangeByScoreWithScores(String key, String max,
String min) {
String min) {
Jedis j = getShard(key);
return j.zrevrangeByScoreWithScores(key, max, min);
}
public Set<Tuple> zrangeByScoreWithScores(String key, String min,
String max, int offset, int count) {
String max, int offset, int count) {
Jedis j = getShard(key);
return j.zrangeByScoreWithScores(key, min, max, offset, count);
}
public Set<Tuple> zrevrangeByScoreWithScores(String key, String max,
String min, int offset, int count) {
String min, int offset, int count) {
Jedis j = getShard(key);
return j.zrevrangeByScoreWithScores(key, max, min, offset, count);
}
public Long zremrangeByRank(String key, int start, int end) {
public Long zremrangeByRank(String key, long start, long end) {
Jedis j = getShard(key);
return j.zremrangeByRank(key, start, end);
}
@@ -472,7 +472,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
Jedis j = getShard(key);
return j.zremrangeByScore(key, start, end);
}
public Long zremrangeByScore(String key, String start, String end) {
Jedis j = getShard(key);
return j.zremrangeByScore(key, start, end);