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

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,