From 75e52b9a26055476ff584e0e6836d9ccdd46cdc6 Mon Sep 17 00:00:00 2001 From: Ivo Ramirez Date: Thu, 22 Dec 2011 22:40:36 +0100 Subject: [PATCH] z*range commands now receive long instead of int. #242 --- .../java/redis/clients/jedis/BinaryClient.java | 14 +++++++------- src/main/java/redis/clients/jedis/Client.java | 14 +++++++------- src/main/java/redis/clients/jedis/Commands.java | 14 +++++++------- .../java/redis/clients/jedis/Connection.java | 3 ++- src/main/java/redis/clients/jedis/Jedis.java | 16 ++++++++-------- .../java/redis/clients/jedis/JedisCommands.java | 10 +++++----- .../java/redis/clients/jedis/ShardedJedis.java | 10 +++++----- 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 812defe..5d681fe 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -362,7 +362,7 @@ public class BinaryClient extends Connection { 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)); } @@ -383,18 +383,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); } @@ -558,7 +558,7 @@ public class BinaryClient extends Connection { 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)); } diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 1f493e0..0e264da 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -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); } @@ -462,7 +462,7 @@ public class Client extends BinaryClient implements Commands { 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); } diff --git a/src/main/java/redis/clients/jedis/Commands.java b/src/main/java/redis/clients/jedis/Commands.java index 235ee88..103ded1 100644 --- a/src/main/java/redis/clients/jedis/Commands.java +++ b/src/main/java/redis/clients/jedis/Commands.java @@ -139,7 +139,7 @@ public interface Commands { 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); @@ -150,13 +150,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); @@ -212,7 +212,7 @@ public interface Commands { public void zrevrangeByScoreWithScores(final String key, final double max, 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, final double end); diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java index 0ea973f..19b3cf3 100644 --- a/src/main/java/redis/clients/jedis/Connection.java +++ b/src/main/java/redis/clients/jedis/Connection.java @@ -113,6 +113,7 @@ public class Connection { } public Connection() { + } public void connect() { @@ -185,7 +186,7 @@ public class Connection { public Long getIntegerReply() { flush(); pipelinedCommands--; - return (Long) protocol.read(inputStream); + return (Long)protocol.read(inputStream); } public List getMultiBulkReply() { diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index c71d9aa..6d320e8 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1436,7 +1436,7 @@ public class Jedis extends BinaryJedis implements JedisCommands { return client.getIntegerReply(); } - public Set zrange(final String key, final int start, final int end) { + public Set zrange(final String key, final long start, final long end) { checkIsInMulti(); client.zrange(key, start, end); final List members = client.getMultiBulkReply(); @@ -1548,24 +1548,24 @@ public class Jedis extends BinaryJedis implements JedisCommands { return client.getIntegerReply(); } - public Set zrevrange(final String key, final int start, - final int end) { + public Set zrevrange(final String key, final long start, + final long end) { checkIsInMulti(); client.zrevrange(key, start, end); final List members = client.getMultiBulkReply(); return new LinkedHashSet(members); } - public Set zrangeWithScores(final String key, final int start, - final int end) { + public Set zrangeWithScores(final String key, final long start, + final long end) { checkIsInMulti(); client.zrangeWithScores(key, start, end); Set set = getTupledSet(); return set; } - public Set zrevrangeWithScores(final String key, final int start, - final int end) { + public Set zrevrangeWithScores(final String key, final long start, + final long end) { checkIsInMulti(); client.zrevrangeWithScores(key, start, end); Set set = getTupledSet(); @@ -2310,7 +2310,7 @@ 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(); diff --git a/src/main/java/redis/clients/jedis/JedisCommands.java b/src/main/java/redis/clients/jedis/JedisCommands.java index 603b60c..2fcb790 100644 --- a/src/main/java/redis/clients/jedis/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/JedisCommands.java @@ -108,7 +108,7 @@ public interface JedisCommands { Long zadd(String key, double score, String member); - Set zrange(String key, int start, int end); + Set zrange(String key, long start, long end); Long zrem(String key, String member); @@ -118,11 +118,11 @@ public interface JedisCommands { Long zrevrank(String key, String member); - Set zrevrange(String key, int start, int end); + Set zrevrange(String key, long start, long end); - Set zrangeWithScores(String key, int start, int end); + Set zrangeWithScores(String key, long start, long end); - Set zrevrangeWithScores(String key, int start, int end); + Set zrevrangeWithScores(String key, long start, long end); Long zcard(String key); @@ -154,7 +154,7 @@ public interface JedisCommands { Set zrevrangeByScoreWithScores(String key, double max, double 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); diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index b294149..890581c 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -288,7 +288,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands { return j.zadd(key, score, member); } - public Set zrange(String key, int start, int end) { + public Set zrange(String key, long start, long end) { Jedis j = getShard(key); return j.zrange(key, start, end); } @@ -313,17 +313,17 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands { return j.zrevrank(key, member); } - public Set zrevrange(String key, int start, int end) { + public Set zrevrange(String key, long start, long end) { Jedis j = getShard(key); return j.zrevrange(key, start, end); } - public Set zrangeWithScores(String key, int start, int end) { + public Set zrangeWithScores(String key, long start, long end) { Jedis j = getShard(key); return j.zrangeWithScores(key, start, end); } - public Set zrevrangeWithScores(String key, int start, int end) { + public Set zrevrangeWithScores(String key, long start, long end) { Jedis j = getShard(key); 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); } - 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); }