diff --git a/src/main/java/redis/clients/jedis/BasicRedisPipeline.java b/src/main/java/redis/clients/jedis/BasicRedisPipeline.java index 0b4ac36..97658d8 100644 --- a/src/main/java/redis/clients/jedis/BasicRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/BasicRedisPipeline.java @@ -22,12 +22,6 @@ public interface BasicRedisPipeline { Response lastsave(); - Response discard(); - - Response> exec(); - - Response multi(); - Response flushDB(); Response flushAll(); diff --git a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java index 3722351..5c04491 100644 --- a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java @@ -111,18 +111,18 @@ public interface BinaryRedisPipeline { Response setrange(String key, long offset, String value); - Response> smembers(byte[] key); + Response> smembers(byte[] key); Response sismember(byte[] key, byte[] member); - Response sort(byte[] key); + Response> sort(byte[] key); - Response> sort(byte[] key, + Response> sort(byte[] key, SortingParams sortingParameters); - Response spop(byte[] key); + Response spop(byte[] key); - Response srandmember(byte[] key); + Response srandmember(byte[] key); Response srem(byte[] key, byte[] member); @@ -142,18 +142,18 @@ public interface BinaryRedisPipeline { Response zincrby(byte[] key, double score, byte[] member); - Response> zrange(byte[] key, int start, int end); + Response> zrange(byte[] key, int start, int end); - Response> zrangeByScore(byte[] key, double min, + Response> zrangeByScore(byte[] key, double min, double max); - Response> zrangeByScore(byte[] key, byte[] min, + Response> zrangeByScore(byte[] key, byte[] min, byte[] max); - Response> zrangeByScore(byte[] key, double min, + Response> zrangeByScore(byte[] key, double min, double max, int offset, int count); - Response> zrangeByScore(byte[] key, byte[] min, + Response> zrangeByScore(byte[] key, byte[] min, byte[] max, int offset, int count); Response> zrangeByScoreWithScores(byte[] key, double min, @@ -168,16 +168,16 @@ public interface BinaryRedisPipeline { Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max, int offset, int count); - Response> zrevrangeByScore(byte[] key, double max, + Response> zrevrangeByScore(byte[] key, double max, double min); - Response> zrevrangeByScore(byte[] key, byte[] max, + Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min); - Response> zrevrangeByScore(byte[] key, double max, + Response> zrevrangeByScore(byte[] key, double max, double min, int offset, int count); - Response> zrevrangeByScore(byte[] key, byte[] max, + Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min, int offset, int count); Response> zrevrangeByScoreWithScores(byte[] key, @@ -204,7 +204,7 @@ public interface BinaryRedisPipeline { Response zremrangeByScore(byte[] key, byte[] start, byte[] end); - Response> zrevrange(byte[] key, int start, int end); + Response> zrevrange(byte[] key, int start, int end); Response> zrevrangeWithScores(byte[] key, int start, int end); diff --git a/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java index 74f0e3d..85d004b 100644 --- a/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java @@ -23,7 +23,7 @@ public interface MultiKeyBinaryRedisPipeline { Response msetnx(byte[]... keysvalues); - Response rename(byte[] oldkey, byte[] newkey); + Response rename(byte[] oldkey, byte[] newkey); Response renamenx(byte[] oldkey, byte[] newkey); @@ -43,7 +43,7 @@ public interface MultiKeyBinaryRedisPipeline { Response> sort(byte[] key, byte[] dstkey); - Response> sunion(byte[]... keys); + Response> sunion(byte[]... keys); Response sunionstore(byte[] dstkey, byte[]... keys); diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java index afd98f5..d605f25 100755 --- a/src/main/java/redis/clients/jedis/Pipeline.java +++ b/src/main/java/redis/clients/jedis/Pipeline.java @@ -586,9 +586,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING); } - public Response rename(byte[] oldkey, byte[] newkey) { + public Response rename(byte[] oldkey, byte[] newkey) { client.rename(oldkey, newkey); - return getResponse(BuilderFactory.BYTE_ARRAY); + return getResponse(BuilderFactory.STRING); } public Response renamenx(String oldkey, String newkey) { @@ -766,9 +766,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_SET); } - public Response> smembers(byte[] key) { + public Response> smembers(byte[] key) { client.smembers(key); - return getResponse(BuilderFactory.STRING_SET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response smove(String srckey, String dstkey, String member) { @@ -781,14 +781,14 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.LONG); } - public Response sort(String key) { + public Response> sort(String key) { client.sort(key); - return getResponse(BuilderFactory.LONG); + return getResponse(BuilderFactory.STRING_LIST); } - public Response sort(byte[] key) { + public Response> sort(byte[] key) { client.sort(key); - return getResponse(BuilderFactory.LONG); + return getResponse(BuilderFactory.BYTE_ARRAY_LIST); } public Response> sort(String key, @@ -797,10 +797,10 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_LIST); } - public Response> sort(byte[] key, + public Response> sort(byte[] key, SortingParams sortingParameters) { client.sort(key, sortingParameters); - return getResponse(BuilderFactory.STRING_LIST); + return getResponse(BuilderFactory.BYTE_ARRAY_LIST); } public Response> sort(String key, @@ -830,9 +830,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING); } - public Response spop(byte[] key) { + public Response spop(byte[] key) { client.spop(key); - return getResponse(BuilderFactory.STRING); + return getResponse(BuilderFactory.BYTE_ARRAY); } public Response srandmember(String key) { @@ -840,9 +840,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING); } - public Response srandmember(byte[] key) { + public Response srandmember(byte[] key) { client.srandmember(key); - return getResponse(BuilderFactory.STRING); + return getResponse(BuilderFactory.BYTE_ARRAY); } public Response srem(String key, String member) { @@ -880,9 +880,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_SET); } - public Response> sunion(byte[]... keys) { + public Response> sunion(byte[]... keys) { client.sunion(keys); - return getResponse(BuilderFactory.STRING_SET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response sunionstore(String dstkey, String... keys) { @@ -992,9 +992,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrange(byte[] key, int start, int end) { + public Response> zrange(byte[] key, int start, int end) { client.zrange(key, start, end); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScore(String key, double min, @@ -1003,7 +1003,7 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrangeByScore(byte[] key, double min, + public Response> zrangeByScore(byte[] key, double min, double max) { return zrangeByScore(key, toByteArray(min), toByteArray(max)); } @@ -1014,10 +1014,10 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrangeByScore(byte[] key, byte[] min, + public Response> zrangeByScore(byte[] key, byte[] min, byte[] max) { client.zrangeByScore(key, min, max); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScore(String key, double min, @@ -1026,15 +1026,15 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrangeByScore(byte[] key, double min, + public Response> zrangeByScore(byte[] key, double min, double max, int offset, int count) { return zrangeByScore(key, toByteArray(min), toByteArray(max), offset, count); } - public Response> zrangeByScore(byte[] key, byte[] min, + public Response> zrangeByScore(byte[] key, byte[] min, byte[] max, int offset, int count) { client.zrangeByScore(key, min, max, offset, count); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScoreWithScores(String key, double min, @@ -1051,7 +1051,7 @@ public class Pipeline extends Queable implements public Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max) { client.zrangeByScoreWithScores(key, min, max); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrangeByScoreWithScores(String key, double min, @@ -1063,13 +1063,13 @@ public class Pipeline extends Queable implements public Response> zrangeByScoreWithScores(byte[] key, double min, double max, int offset, int count) { client.zrangeByScoreWithScores(key, toByteArray(min), toByteArray(max), offset, count); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max, int offset, int count) { client.zrangeByScoreWithScores(key, min, max, offset, count); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrevrangeByScore(String key, double max, @@ -1078,10 +1078,10 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrangeByScore(byte[] key, double max, + public Response> zrevrangeByScore(byte[] key, double max, double min) { client.zrevrangeByScore(key, toByteArray(max), toByteArray(min)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrevrangeByScore(String key, String max, @@ -1090,10 +1090,10 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrangeByScore(byte[] key, byte[] max, + public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min) { client.zrevrangeByScore(key, max, min); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrevrangeByScore(String key, double max, @@ -1102,16 +1102,16 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrangeByScore(byte[] key, double max, + public Response> zrevrangeByScore(byte[] key, double max, double min, int offset, int count) { client.zrevrangeByScore(key, toByteArray(max), toByteArray(min), offset, count); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } - public Response> zrevrangeByScore(byte[] key, byte[] max, + public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min, int offset, int count) { client.zrevrangeByScore(key, max, min, offset, count); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrevrangeByScoreWithScores(String key, @@ -1123,13 +1123,13 @@ public class Pipeline extends Queable implements public Response> zrevrangeByScoreWithScores(byte[] key, double max, double min) { client.zrevrangeByScoreWithScores(key, toByteArray(max), toByteArray(min)); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] min) { client.zrevrangeByScoreWithScores(key, max, min); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrevrangeByScoreWithScores(String key, @@ -1141,13 +1141,13 @@ public class Pipeline extends Queable implements public Response> zrevrangeByScoreWithScores(byte[] key, double max, double min, int offset, int count) { client.zrevrangeByScoreWithScores(key, toByteArray(max), toByteArray(min), offset, count); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] min, int offset, int count) { client.zrevrangeByScoreWithScores(key, max, min, offset, count); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response> zrangeWithScores(String key, int start, int end) { @@ -1157,7 +1157,7 @@ public class Pipeline extends Queable implements public Response> zrangeWithScores(byte[] key, int start, int end) { client.zrangeWithScores(key, start, end); - return getResponse(BuilderFactory.TUPLE_ZSET); + return getResponse(BuilderFactory.TUPLE_ZSET_BINARY); } public Response zrank(String key, String member) { @@ -1210,9 +1210,9 @@ public class Pipeline extends Queable implements return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrange(byte[] key, int start, int end) { + public Response> zrevrange(byte[] key, int start, int end) { client.zrevrange(key, start, end); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrevrangeWithScores(String key, int start, diff --git a/src/main/java/redis/clients/jedis/RedisPipeline.java b/src/main/java/redis/clients/jedis/RedisPipeline.java index 8d42aa2..b1c8461 100644 --- a/src/main/java/redis/clients/jedis/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/RedisPipeline.java @@ -116,7 +116,7 @@ public interface RedisPipeline { Response> smembers(String key); - Response sort(String key); + Response> sort(String key); Response> sort(String key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java index 1234b44..2601f9c 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java +++ b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java @@ -700,11 +700,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_SET); } - public Response> smembers(byte[] key) { + public Response> smembers(byte[] key) { Client c = getClient(key); c.smembers(key); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_SET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response srem(String key, String member) { @@ -742,11 +742,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING); } - public Response spop(byte[] key) { + public Response spop(byte[] key) { Client c = getClient(key); c.spop(key); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING); + return getResponse(BuilderFactory.BYTE_ARRAY); } public Response scard(String key) { @@ -784,11 +784,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING); } - public Response srandmember(byte[] key) { + public Response srandmember(byte[] key) { Client c = getClient(key); c.srandmember(key); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING); + return getResponse(BuilderFactory.BYTE_ARRAY); } public Response zadd(String key, double score, String member) { @@ -812,11 +812,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrange(byte[] key, int start, int end) { + public Response> zrange(byte[] key, int start, int end) { Client c = getClient(key); c.zrange(key, start, end); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response zrem(String key, String member) { @@ -882,11 +882,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrange(byte[] key, int start, int end) { + public Response> zrevrange(byte[] key, int start, int end) { Client c = getClient(key); c.zrevrange(key, start, end); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeWithScores(String key, int start, int end) { @@ -945,18 +945,18 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.DOUBLE); } - public Response sort(String key) { + public Response> sort(String key) { Client c = getClient(key); c.sort(key); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.LONG); + return getResponse(BuilderFactory.STRING_LIST); } - public Response sort(byte[] key) { + public Response> sort(byte[] key) { Client c = getClient(key); c.sort(key); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.LONG); + return getResponse(BuilderFactory.BYTE_ARRAY_LIST); } public Response> sort(String key, SortingParams sortingParameters) { @@ -966,11 +966,11 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_LIST); } - public Response> sort(byte[] key, SortingParams sortingParameters) { + public Response> sort(byte[] key, SortingParams sortingParameters) { Client c = getClient(key); c.sort(key, sortingParameters); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_LIST); + return getResponse(BuilderFactory.BYTE_ARRAY_LIST); } public Response zcount(String key, double min, double max) { @@ -1001,18 +1001,18 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrangeByScore(byte[] key, double max, double min) { + public Response> zrevrangeByScore(byte[] key, double max, double min) { Client c = getClient(key); c.zrevrangeByScore(key, toByteArray(min), toByteArray(max)); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } - public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min) { + public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min) { Client c = getClient(key); c.zrevrangeByScore(key, min, max); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrevrangeByScore(String key, double max, double min, int offset, int count) { @@ -1022,18 +1022,18 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrevrangeByScore(byte[] key, double max, double min, int offset, int count) { + public Response> zrevrangeByScore(byte[] key, double max, double min, int offset, int count) { Client c = getClient(key); c.zrevrangeByScore(key, toByteArray(min), toByteArray(max), offset, count); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } - public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min, int offset, int count) { + public Response> zrevrangeByScore(byte[] key, byte[] max, byte[] min, int offset, int count) { Client c = getClient(key); c.zrevrangeByScore(key, min, max, offset, count); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScore(String key, String min, String max) { @@ -1050,18 +1050,18 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrangeByScore(byte[] key, double min, double max) { + public Response> zrangeByScore(byte[] key, double min, double max) { Client c = getClient(key); c.zrangeByScore(key, toByteArray(min), toByteArray(max)); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } - public Response> zrangeByScore(byte[] key, byte[] min, byte[] max) { + public Response> zrangeByScore(byte[] key, byte[] min, byte[] max) { Client c = getClient(key); c.zrangeByScore(key, min, max); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScore(String key, double min, double max, @@ -1072,20 +1072,20 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline return getResponse(BuilderFactory.STRING_ZSET); } - public Response> zrangeByScore(byte[] key, double min, double max, + public Response> zrangeByScore(byte[] key, double min, double max, int offset, int count) { Client c = getClient(key); c.zrangeByScore(key, toByteArray(min), toByteArray(max), offset, count); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } - public Response> zrangeByScore(byte[] key, byte[] min, byte[] max, + public Response> zrangeByScore(byte[] key, byte[] min, byte[] max, int offset, int count) { Client c = getClient(key); c.zrangeByScore(key, min, max, offset, count); results.add(new FutureResult(c)); - return getResponse(BuilderFactory.STRING_ZSET); + return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); } public Response> zrangeByScoreWithScores(String key, double min, double max) {