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

z*range commands now receive long instead of int. #242

Browse Source
This commit is contained in:
Ivo Ramirez
2011-12-22 22:40:36 +01:00
committed by ivowiblo
parent be163acd52
commit 75e52b9a26
7 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,7 +362,7 @@ public class BinaryClient extends Connection {
sendCommand(ZADD, key, toByteArray(score), member); sendCommand(ZADD, key, toByteArray(score), member);
} }
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)); sendCommand(ZRANGE, key, toByteArray(start), toByteArray(end));
} }
@@ -383,18 +383,18 @@ public class BinaryClient extends Connection {
sendCommand(ZREVRANK, key, member); 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)); sendCommand(ZREVRANGE, key, toByteArray(start), toByteArray(end));
} }
public void zrangeWithScores(final byte[] key, final int start, public void zrangeWithScores(final byte[] key, final long start,
final int end) { final long end) {
sendCommand(ZRANGE, key, toByteArray(start), toByteArray(end), sendCommand(ZRANGE, key, toByteArray(start), toByteArray(end),
WITHSCORES.raw); WITHSCORES.raw);
} }
public void zrevrangeWithScores(final byte[] key, final int start, public void zrevrangeWithScores(final byte[] key, final long start,
final int end) { final long end) {
sendCommand(ZREVRANGE, key, toByteArray(start), toByteArray(end), sendCommand(ZREVRANGE, key, toByteArray(start), toByteArray(end),
WITHSCORES.raw); WITHSCORES.raw);
} }
@@ -558,7 +558,7 @@ public class BinaryClient extends Connection {
WITHSCORES.raw); 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)); sendCommand(ZREMRANGEBYRANK, key, toByteArray(start), toByteArray(end));
} }

14
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)); 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); zrange(SafeEncoder.encode(key), start, end);
} }
@@ -340,17 +340,17 @@ public class Client extends BinaryClient implements Commands {
zrevrank(SafeEncoder.encode(key), SafeEncoder.encode(member)); 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); zrevrange(SafeEncoder.encode(key), start, end);
} }
public void zrangeWithScores(final String key, final int start, public void zrangeWithScores(final String key, final long start,
final int end) { final long end) {
zrangeWithScores(SafeEncoder.encode(key), start, end); zrangeWithScores(SafeEncoder.encode(key), start, end);
} }
public void zrevrangeWithScores(final String key, final int start, public void zrevrangeWithScores(final String key, final long start,
final int end) { final long end) {
zrevrangeWithScores(SafeEncoder.encode(key), start, end); zrevrangeWithScores(SafeEncoder.encode(key), start, end);
} }
@@ -462,7 +462,7 @@ public class Client extends BinaryClient implements Commands {
count); count);
} }
public void zremrangeByRank(final String key, final int start, final int end) { public void zremrangeByRank(final String key, final long start, final long end) {
zremrangeByRank(SafeEncoder.encode(key), start, end); zremrangeByRank(SafeEncoder.encode(key), start, end);
} }

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

@@ -139,7 +139,7 @@ public interface Commands {
public void zadd(final String key, final double score, final String member); public void zadd(final String key, final double score, final String 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);
public void zrem(final String key, final String member); public void zrem(final String key, final String member);
@@ -150,13 +150,13 @@ public interface Commands {
public void zrevrank(final String key, final String member); 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, public void zrangeWithScores(final String key, final long start,
final int end); final long end);
public void zrevrangeWithScores(final String key, final int start, public void zrevrangeWithScores(final String key, final long start,
final int end); final long end);
public void zcard(final String key); public void zcard(final String key);
@@ -212,7 +212,7 @@ public interface Commands {
public void zrevrangeByScoreWithScores(final String key, final double max, public void zrevrangeByScoreWithScores(final String key, final double max,
final double min, final int offset, final int count); final double min, final int offset, final int count);
public void zremrangeByRank(final String key, final int start, final int end); public void zremrangeByRank(final String key, final long start, final long end);
public void zremrangeByScore(final String key, final double start, public void zremrangeByScore(final String key, final double start,
final double end); final double end);

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

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

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

@@ -1436,7 +1436,7 @@ public class Jedis extends BinaryJedis implements JedisCommands {
return client.getIntegerReply(); 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(); checkIsInMulti();
client.zrange(key, start, end); client.zrange(key, start, end);
final List<String> members = client.getMultiBulkReply(); final List<String> members = client.getMultiBulkReply();
@@ -1548,24 +1548,24 @@ public class Jedis extends BinaryJedis implements JedisCommands {
return client.getIntegerReply(); return client.getIntegerReply();
} }
public Set<String> zrevrange(final String key, final int start, public Set<String> zrevrange(final String key, final long start,
final int end) { final long end) {
checkIsInMulti(); checkIsInMulti();
client.zrevrange(key, start, end); client.zrevrange(key, start, end);
final List<String> members = client.getMultiBulkReply(); final List<String> members = client.getMultiBulkReply();
return new LinkedHashSet<String>(members); return new LinkedHashSet<String>(members);
} }
public Set<Tuple> zrangeWithScores(final String key, final int start, public Set<Tuple> zrangeWithScores(final String key, final long start,
final int end) { final long end) {
checkIsInMulti(); checkIsInMulti();
client.zrangeWithScores(key, start, end); client.zrangeWithScores(key, start, end);
Set<Tuple> set = getTupledSet(); Set<Tuple> set = getTupledSet();
return set; return set;
} }
public Set<Tuple> zrevrangeWithScores(final String key, final int start, public Set<Tuple> zrevrangeWithScores(final String key, final long start,
final int end) { final long end) {
checkIsInMulti(); checkIsInMulti();
client.zrevrangeWithScores(key, start, end); client.zrevrangeWithScores(key, start, end);
Set<Tuple> set = getTupledSet(); Set<Tuple> set = getTupledSet();
@@ -2310,7 +2310,7 @@ public class Jedis extends BinaryJedis implements JedisCommands {
* operation * 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(); checkIsInMulti();
client.zremrangeByRank(key, start, end); client.zremrangeByRank(key, start, end);
return client.getIntegerReply(); return client.getIntegerReply();

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

@@ -108,7 +108,7 @@ public interface JedisCommands {
Long zadd(String key, double score, String member); Long zadd(String key, double score, String member);
Set<String> zrange(String key, int start, int end); Set<String> zrange(String key, long start, long end);
Long zrem(String key, String member); Long zrem(String key, String member);
@@ -118,11 +118,11 @@ public interface JedisCommands {
Long zrevrank(String key, String member); 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); Long zcard(String key);
@@ -154,7 +154,7 @@ public interface JedisCommands {
Set<Tuple> zrevrangeByScoreWithScores(String key, double max, double min, Set<Tuple> zrevrangeByScoreWithScores(String key, double max, double min,
int offset, int count); 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); Long zremrangeByScore(String key, double start, double end);

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

@@ -288,7 +288,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
return j.zadd(key, score, member); return j.zadd(key, score, member);
} }
public Set<String> zrange(String key, int start, int end) { public Set<String> zrange(String key, long start, long end) {
Jedis j = getShard(key); Jedis j = getShard(key);
return j.zrange(key, start, end); return j.zrange(key, start, end);
} }
@@ -313,17 +313,17 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
return j.zrevrank(key, member); 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); Jedis j = getShard(key);
return j.zrevrange(key, start, end); 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); Jedis j = getShard(key);
return j.zrangeWithScores(key, start, end); 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); Jedis j = getShard(key);
return j.zrevrangeWithScores(key, start, end); return j.zrevrangeWithScores(key, start, end);
} }
@@ -398,7 +398,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
return j.zrevrangeByScoreWithScores(key, max, min, offset, count); 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); Jedis j = getShard(key);
return j.zremrangeByRank(key, start, end); return j.zremrangeByRank(key, start, end);
} }