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

Added bitcount to standard interfaces and bitop to MultiKey interfaces (since it is non-shardable)

Browse Source 
Merge branch 'impl-bitcount-and-bitop' of git://github.com/koron/jedis

Conflicts:
	src/main/java/redis/clients/jedis/JedisCommands.java
This commit is contained in:
samhendley
2013-01-09 23:48:23 -05:00
parent 1a96769481 4570329924
commit 4c7cc57ede
21 changed files with 262 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,4 +819,41 @@ public class BinaryClient extends Connection {
public void objectEncoding(byte[] key) {
sendCommand(OBJECT, ENCODING.raw, key);
}
public void bitcount(byte[] key) {
sendCommand(BITCOUNT, key);
}
public void bitcount(byte[] key, long start, long end) {
sendCommand(BITCOUNT, key, toByteArray(start), toByteArray(end));
}
public void bitop(BitOP op, byte[] destKey, byte[]... srcKeys) {
Keyword kw = Keyword.AND;
int len = srcKeys.length;
switch (op) {
case AND:
kw = Keyword.AND;
break;
case OR:
kw = Keyword.OR;
break;
case XOR:
kw = Keyword.XOR;
break;
case NOT:
kw = Keyword.NOT;
len = Math.min(1, len);
break;
}
byte[][] bargs = new byte[len + 2][];
bargs[0] = kw.raw;
bargs[1] = destKey;
for (int i = 0; i < len; ++i) {
bargs[i + 2] = srcKeys[i];
}
sendCommand(BITOP, bargs);
}
}

15
src/main/java/redis/clients/jedis/BinaryJedis.java
View File

@@ -3218,4 +3218,19 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey
client.objectIdletime(key);
return client.getIntegerReply();
}
public Long bitcount(final byte[] key) {
client.bitcount(key);
return client.getIntegerReply();
}
public Long bitcount(final byte[] key, long start, long end) {
client.bitcount(key, start, end);
return client.getIntegerReply();
}
public Long bitop(BitOP op, final byte[] destKey, byte[]... srcKeys) {
client.bitop(op, destKey, srcKeys);
return client.getIntegerReply();
}
}

4
src/main/java/redis/clients/jedis/BinaryJedisCommands.java
View File

@@ -209,4 +209,8 @@ public interface BinaryJedisCommands {
byte[] echo(byte[] arg);
Long move(byte[] key, int dbIndex);
Long bitcount(final byte[] key);
Long bitcount(final byte[] key, long start, long end);
}

4
src/main/java/redis/clients/jedis/BinaryRedisPipeline.java
View File

@@ -212,4 +212,8 @@ public interface BinaryRedisPipeline {
Response<Long> zrevrank(byte[] key, byte[] member);
Response<Double> zscore(byte[] key, byte[] member);
Response<Long> bitcount(byte[] key);
Response<Long> bitcount(byte[] key, long start, long end);
}

8
src/main/java/redis/clients/jedis/BinaryShardedJedis.java
View File

@@ -554,5 +554,13 @@ public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo>
return j.blpop(arg);
}
public Long bitcount(byte[] key) {
Jedis j = getShard(key);
return j.bitcount(key);
}
public Long bitcount(byte[] key, long start, long end) {
Jedis j = getShard(key);
return j.bitcount(key, start, end);
}
}

8
src/main/java/redis/clients/jedis/BitOP.java Normal file
View File

@@ -0,0 +1,8 @@
package redis.clients.jedis;
public enum BitOP {
AND,
OR,
XOR,
NOT;
}

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

@@ -707,4 +707,16 @@ public class Client extends BinaryClient implements Commands {
public void objectEncoding(String key) {
objectEncoding(SafeEncoder.encode(key));
}
public void bitcount(final String key) {
bitcount(SafeEncoder.encode(key));
}
public void bitcount(final String key, long start, long end) {
bitcount(SafeEncoder.encode(key), start, end);
}
public void bitop(BitOP op, final String destKey, String... srcKeys) {
bitop(op, SafeEncoder.encode(destKey), getByteParams(srcKeys));
}
}

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

@@ -287,4 +287,10 @@ public interface Commands {
public void objectIdletime(String key);
public void objectEncoding(String key);
}
public void bitcount(final String key);
public void bitcount(final String key, long start, long end);
public void bitop(BitOP op, final String destKey, String... srcKeys);
}

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

@@ -814,8 +814,6 @@ public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommand
* <p>
* Time complexity: O(1)
*
* @see Jedis#lpush(String, String)
*
* @param key
* @param strings
* @return Integer reply, specifically, the number of elements inside the
@@ -835,8 +833,6 @@ public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommand
* <p>
* Time complexity: O(1)
*
* @see Jedis#rpush(String, String)
*
* @param key
* @param strings
* @return Integer reply, specifically, the number of elements inside the
@@ -2844,4 +2840,19 @@ public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommand
client.objectIdletime(string);
return client.getIntegerReply();
}
public Long bitcount(final String key) {
client.bitcount(key);
return client.getIntegerReply();
}
public Long bitcount(final String key, long start, long end) {
client.bitcount(key, start, end);
return client.getIntegerReply();
}
public Long bitop(BitOP op, final String destKey, String... srcKeys) {
client.bitop(op, destKey, srcKeys);
return client.getIntegerReply();
}
}

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

@@ -206,4 +206,8 @@ public interface JedisCommands {
String echo(String string);
Long move(String key, int dbIndex);
Long bitcount(final String key);
Long bitcount(final String key, long start, long end);
}

2
src/main/java/redis/clients/jedis/MultiKeyBinaryCommands.java
View File

@@ -68,4 +68,6 @@ public interface MultiKeyBinaryCommands {
void psubscribe(BinaryJedisPubSub jedisPubSub, byte[]... patterns);
byte[] randomBinaryKey();
Long bitop(BitOP op, final byte[] destKey, byte[]... srcKeys);
}

2
src/main/java/redis/clients/jedis/MultiKeyBinaryRedisPipeline.java
View File

@@ -62,4 +62,6 @@ public interface MultiKeyBinaryRedisPipeline {
Response<Long> publish(byte[] channel, byte[] message);
Response<byte[]> randomKeyBinary();
Response<Long> bitop(BitOP op, final byte[] destKey, byte[]... srcKeys);
}

2
src/main/java/redis/clients/jedis/MultiKeyCommands.java
View File

@@ -68,4 +68,6 @@ public interface MultiKeyCommands {
void psubscribe(JedisPubSub jedisPubSub, String... patterns);
String randomKey();
Long bitop(BitOP op, final String destKey, String... srcKeys);
}

2
src/main/java/redis/clients/jedis/MultiKeyCommandsPipeline.java
View File

@@ -62,4 +62,6 @@ public interface MultiKeyCommandsPipeline {
Response<Long> publish(String channel, String message);
Response<String> randomKey();
Response<Long> bitop(BitOP op, final String destKey, String... srcKeys);
}

32
src/main/java/redis/clients/jedis/Pipeline.java
View File

@@ -1388,5 +1388,35 @@ public class Pipeline extends Queable implements
public Response<String> select(int index){
client.select(index);
return getResponse(BuilderFactory.STRING);
}
}
public Response<Long> bitcount(String key) {
client.bitcount(key);
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(String key, long start, long end) {
client.bitcount(key, start, end);
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(byte[] key) {
client.bitcount(key);
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(byte[] key, long start, long end) {
client.bitcount(key, start, end);
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitop(BitOP op, byte[] destKey, byte[]... srcKeys) {
client.bitop(op, destKey, srcKeys);
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitop(BitOP op, String destKey, String... srcKeys) {
client.bitop(op, destKey, srcKeys);
return getResponse(BuilderFactory.LONG);
}
}

4
src/main/java/redis/clients/jedis/Protocol.java
View File

@@ -148,7 +148,7 @@ public final class Protocol {
}
public static enum Command {
PING, SET, GET, QUIT, EXISTS, DEL, TYPE, FLUSHDB, KEYS, RANDOMKEY, RENAME, RENAMENX, RENAMEX, DBSIZE, EXPIRE, EXPIREAT, TTL, SELECT, MOVE, FLUSHALL, GETSET, MGET, SETNX, SETEX, MSET, MSETNX, DECRBY, DECR, INCRBY, INCR, APPEND, SUBSTR, HSET, HGET, HSETNX, HMSET, HMGET, HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG, BRPOPLPUSH, SETBIT, GETBIT, SETRANGE, GETRANGE, EVAL, EVALSHA, SCRIPT, SLOWLOG, OBJECT;
PING, SET, GET, QUIT, EXISTS, DEL, TYPE, FLUSHDB, KEYS, RANDOMKEY, RENAME, RENAMENX, RENAMEX, DBSIZE, EXPIRE, EXPIREAT, TTL, SELECT, MOVE, FLUSHALL, GETSET, MGET, SETNX, SETEX, MSET, MSETNX, DECRBY, DECR, INCRBY, INCR, APPEND, SUBSTR, HSET, HGET, HSETNX, HMSET, HMGET, HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG, BRPOPLPUSH, SETBIT, GETBIT, SETRANGE, GETRANGE, EVAL, EVALSHA, SCRIPT, SLOWLOG, OBJECT, BITCOUNT, BITOP;
public final byte[] raw;
@@ -158,7 +158,7 @@ public final class Protocol {
}
public static enum Keyword {
AGGREGATE, ALPHA, ASC, BY, DESC, GET, LIMIT, MESSAGE, NO, NOSORT, PMESSAGE, PSUBSCRIBE, PUNSUBSCRIBE, OK, ONE, QUEUED, SET, STORE, SUBSCRIBE, UNSUBSCRIBE, WEIGHTS, WITHSCORES, RESETSTAT, RESET, FLUSH, EXISTS, LOAD, KILL, LEN, REFCOUNT, ENCODING, IDLETIME;
AGGREGATE, ALPHA, ASC, BY, DESC, GET, LIMIT, MESSAGE, NO, NOSORT, PMESSAGE, PSUBSCRIBE, PUNSUBSCRIBE, OK, ONE, QUEUED, SET, STORE, SUBSCRIBE, UNSUBSCRIBE, WEIGHTS, WITHSCORES, RESETSTAT, RESET, FLUSH, EXISTS, LOAD, KILL, LEN, REFCOUNT, ENCODING, IDLETIME, AND, OR, XOR, NOT;
public final byte[] raw;
Keyword() {

4
src/main/java/redis/clients/jedis/RedisPipeline.java
View File

@@ -193,4 +193,8 @@ public interface RedisPipeline {
Response<Long> zrevrank(String key, String member);
Response<Double> zscore(String key, String member);
Response<Long> bitcount(String key);
Response<Long> bitcount(String key, long start, long end);
}

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

@@ -511,4 +511,16 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
Jedis j = getShard(key);
return j.linsert(key, where, pivot, value);
}
public Long bitcount(final String key) {
Jedis j = getShard(key);
return j.bitcount(key);
}
public Long bitcount(final String key, long start, long end) {
Jedis j = getShard(key);
return j.bitcount(key, start, end);
}
}

28
src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
View File

@@ -1282,6 +1282,34 @@ public class ShardedJedisPipeline extends Queable implements BinaryRedisPipeline
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(String key) {
Client c = getClient(key);
c.bitcount(key);
results.add(new FutureResult(c));
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(String key, long start, long end) {
Client c = getClient(key);
c.bitcount(key, start, end);
results.add(new FutureResult(c));
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(byte[] key) {
Client c = getClient(key);
c.bitcount(key);
results.add(new FutureResult(c));
return getResponse(BuilderFactory.LONG);
}
public Response<Long> bitcount(byte[] key, long start, long end) {
Client c = getClient(key);
c.bitcount(key, start, end);
results.add(new FutureResult(c));
return getResponse(BuilderFactory.LONG);
}
public List<Object> getResults() {
List<Object> r = new ArrayList<Object>();
for (FutureResult fr : results) {