Manually merge redis#578 to master

Hailei · May 25, 2014 · 6106f5b · 6106f5b
1 parent bc9e49d
commit 6106f5b
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 3 deletions.
diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -925,7 +925,15 @@ public void setbit(byte[] key, long offset, boolean value) {
     public void getbit(byte[] key, long offset) {
 	sendCommand(GETBIT, key, toByteArray(offset));
     }
-
+
+    public void bitpos(final byte[] key, final boolean value, final BitPosParams params) {
+	final List<byte[]> args = new ArrayList<byte[]>();
+	args.add(key);
+	args.add(toByteArray(value));
+	args.addAll(params.getParams());
+	sendCommand(BITPOS, args.toArray(new byte[args.size()][]));
+    }
+
     public void setrange(byte[] key, long offset, byte[] value) {
 	sendCommand(SETRANGE, key, toByteArray(offset), value);
     }

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -3125,6 +3125,15 @@ public Boolean getbit(byte[] key, long offset) {
 	client.getbit(key, offset);
 	return client.getIntegerReply() == 1;
     }
+
+    public Long bitpos(final byte[] key, final boolean value) {
+	return bitpos(key, value, new BitPosParams());
+    }
+
+    public Long bitpos(final byte[] key, final boolean value, final BitPosParams params) {
+	client.bitpos(key, value, params);
+	return client.getIntegerReply();
+    }
 
     public Long setrange(byte[] key, long offset, byte[] value) {
 	client.setrange(key, offset, value);

diff --git a/src/main/java/redis/clients/jedis/BitPosParams.java b/src/main/java/redis/clients/jedis/BitPosParams.java
@@ -0,0 +1,27 @@
+package redis.clients.jedis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class BitPosParams {
+    private List<byte[]> params = new ArrayList<byte[]>();
+
+    protected BitPosParams() {
+    }
+
+    public BitPosParams(long start) {
+	params.add(Protocol.toByteArray(start));
+    }
+
+    public BitPosParams(long start, long end) {
+	this(start);
+
+	params.add(Protocol.toByteArray(end));
+    }
+
+    public Collection<byte[]> getParams() {
+	return Collections.unmodifiableCollection(params);
+    }
+}
diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java
@@ -628,6 +628,10 @@ public void setbit(final String key, final long offset, final String value) {
     public void getbit(String key, long offset) {
 	getbit(SafeEncoder.encode(key), offset);
     }
+
+    public void bitpos(final String key, final boolean value, final BitPosParams params) {
+	bitpos(SafeEncoder.encode(key), value, params);
+    }
 
     public void setrange(String key, long offset, String value) {
 	setrange(SafeEncoder.encode(key), offset, SafeEncoder.encode(value));

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -2652,6 +2652,15 @@ public String getrange(String key, long startOffset, long endOffset) {
 	client.getrange(key, startOffset, endOffset);
 	return client.getBulkReply();
     }
+
+    public Long bitpos(final String key, final boolean value) {
+	return bitpos(key, value, new BitPosParams());
+    }
+
+    public Long bitpos(final String key, final boolean value, final BitPosParams params) {
+	client.bitpos(key, value, params);
+	return client.getIntegerReply();
+    }
 
     /**
      * Retrieve the configuration of a running Redis server. Not all the

diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java
@@ -142,7 +142,25 @@ public Response<Boolean> getbit(byte[] key, long offset) {
 	getClient(key).getbit(key, offset);
 	return getResponse(BuilderFactory.BOOLEAN);
     }
-
+
+    public Response<Long> bitpos(final String key, final boolean value) {
+	return bitpos(key, value, new BitPosParams());
+    }
+
+    public Response<Long> bitpos(final String key, final boolean value, final BitPosParams params) {
+	getClient(key).bitpos(key, value, params);
+	return getResponse(BuilderFactory.LONG);
+    }
+
+    public Response<Long> bitpos(final byte[] key, final boolean value) {
+	return bitpos(key, value, new BitPosParams());
+    }
+
+    public Response<Long> bitpos(final byte[] key, final boolean value, final BitPosParams params) {
+	getClient(key).bitpos(key, value, params);
+	return getResponse(BuilderFactory.LONG);
+    }
+
     public Response<String> getrange(String key, long startOffset,
 	    long endOffset) {
 	getClient(key).getrange(key, startOffset, endOffset);

diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java
@@ -208,7 +208,7 @@ public static final byte[] toByteArray(final double value) {
     }
 
     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, PUBSUB, 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, SENTINEL, DUMP, RESTORE, PEXPIRE, PEXPIREAT, PTTL, INCRBYFLOAT, PSETEX, CLIENT, TIME, MIGRATE, HINCRBYFLOAT, SCAN, HSCAN, SSCAN, ZSCAN, WAIT, CLUSTER, ASKING, PFADD, PFCOUNT, PFMERGE;
+	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, PUBSUB, 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, BITPOS, SETRANGE, GETRANGE, EVAL, EVALSHA, SCRIPT, SLOWLOG, OBJECT, BITCOUNT, BITOP, SENTINEL, DUMP, RESTORE, PEXPIRE, PEXPIREAT, PTTL, INCRBYFLOAT, PSETEX, CLIENT, TIME, MIGRATE, HINCRBYFLOAT, SCAN, HSCAN, SSCAN, ZSCAN, WAIT, CLUSTER, ASKING, PFADD, PFCOUNT, PFMERGE;
 
 	public final byte[] raw;
 

diff --git a/src/test/java/redis/clients/jedis/tests/commands/BitCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/BitCommandsTest.java
@@ -3,6 +3,8 @@
 import org.junit.Test;
 
 import redis.clients.jedis.BitOP;
+import redis.clients.jedis.BitPosParams;
+import redis.clients.jedis.Protocol;
 
 public class BitCommandsTest extends JedisCommandTestBase {
     @Test
@@ -20,6 +22,111 @@ public void setAndgetbit() {
 	assertTrue(bbit);
     }
 
+    @Test
+    public void bitpos() {
+	String foo = "foo";
+
+	jedis.set(foo, String.valueOf(0));
+
+	jedis.setbit(foo, 3, true);
+	jedis.setbit(foo, 7, true);
+	jedis.setbit(foo, 13, true);
+	jedis.setbit(foo, 39, true);
+
+	/*
+	 * byte:    0          1          2           3          4
+	 * bit:  00010001 / 00000100 / 00000000 / 00000000 / 00000001
+	 */
+	long offset = jedis.bitpos(foo, true);
+	assertEquals(2, offset);
+	offset = jedis.bitpos(foo, false);
+	assertEquals(0, offset);
+
+	offset = jedis.bitpos(foo, true, new BitPosParams(1));
+	assertEquals(13, offset);
+	offset = jedis.bitpos(foo, false, new BitPosParams(1));
+	assertEquals(8, offset);
+
+	offset = jedis.bitpos(foo, true, new BitPosParams(2, 3));
+	assertEquals(-1, offset);
+	offset = jedis.bitpos(foo, false, new BitPosParams(2, 3));
+	assertEquals(16, offset);
+
+	offset = jedis.bitpos(foo, true, new BitPosParams(3, 4));
+	assertEquals(39, offset);
+    }
+
+    @Test
+    public void bitposBinary() {
+	// binary
+	byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
+
+	jedis.set(bfoo, Protocol.toByteArray(0));
+
+	jedis.setbit(bfoo, 3, true);
+	jedis.setbit(bfoo, 7, true);
+	jedis.setbit(bfoo, 13, true);
+	jedis.setbit(bfoo, 39, true);
+
+	/*
+	 * byte:    0          1          2           3          4
+	 * bit:  00010001 / 00000100 / 00000000 / 00000000 / 00000001
+	 */
+	long offset = jedis.bitpos(bfoo, true);
+	assertEquals(2, offset);
+	offset = jedis.bitpos(bfoo, false);
+	assertEquals(0, offset);
+
+	offset = jedis.bitpos(bfoo, true, new BitPosParams(1));
+	assertEquals(13, offset);
+	offset = jedis.bitpos(bfoo, false, new BitPosParams(1));
+	assertEquals(8, offset);
+
+	offset = jedis.bitpos(bfoo, true, new BitPosParams(2, 3));
+	assertEquals(-1, offset);
+	offset = jedis.bitpos(bfoo, false, new BitPosParams(2, 3));
+	assertEquals(16, offset);
+
+	offset = jedis.bitpos(bfoo, true, new BitPosParams(3, 4));
+	assertEquals(39, offset);
+    }
+
+    @Test
+    public void bitposWithNoMatchingBitExist() {
+	String foo = "foo";
+
+	jedis.set(foo, String.valueOf(0));
+	for (int idx = 0; idx < 8; idx++) {
+	    jedis.setbit(foo, idx, true);
+	}
+
+	/*
+	 * byte: 0
+	 * bit: 11111111
+	 */
+	long offset = jedis.bitpos(foo, false);
+	// offset should be last index + 1
+	assertEquals(8, offset);
+    }
+
+    @Test
+    public void bitposWithNoMatchingBitExistWithinRange() {
+	String foo = "foo";
+
+	jedis.set(foo, String.valueOf(0));
+	for (int idx = 0; idx < 8 * 5; idx++) {
+	    jedis.setbit(foo, idx, true);
+	}
+
+	/*
+	 * byte:    0          1         2          3          4
+	 * bit: 11111111 / 11111111 / 11111111 / 11111111 / 11111111
+	 */
+	long offset = jedis.bitpos(foo, false, new BitPosParams(2, 3));
+	// offset should be -1
+	assertEquals(-1, offset);
+    }
+
     @Test
     public void setAndgetrange() {
 	jedis.set("key1", "Hello World");