Merge branch 'master' into 5.0

Author: sazzad16

src/test/java/redis/clients/jedis/commands/jedis/BitCommandsTest.java

@@ -35,14 +35,16 @@ public void bitpos() {
     String foo = "foo";
 
     jedis.set(foo, String.valueOf(0));
+    //  string "0" with bits: 0011 0000
 
     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
+     * bit:  00110001 / 00000100 / 00000000 / 00000000 / 00000001
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(foo, true);
     assertEquals(2, offset);
@@ -69,14 +71,16 @@ public void bitposBinary() {
     byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
 
     jedis.set(bfoo, Protocol.toByteArray(0));
+    // bits: 0011 0000
 
     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
+     * bit:  00110001 / 00000100 / 00000000 / 00000000 / 00000001
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(bfoo, true);
     assertEquals(2, offset);
@@ -107,7 +111,8 @@ public void bitposWithNoMatchingBitExist() {
     }
 
     /*
-     * byte: 0 bit: 11111111
+     * bit:  11111111
+     * byte: 0
      */
     long offset = jedis.bitpos(foo, false);
     // offset should be last index + 1
@@ -124,7 +129,8 @@ public void bitposWithNoMatchingBitExistWithinRange() {
     }
 
     /*
-     * byte: 0 1 2 3 4 bit: 11111111 / 11111111 / 11111111 / 11111111 / 11111111
+     * bit:  11111111 / 11111111 / 11111111 / 11111111 / 11111111
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(foo, false, new BitPosParams(2, 3));
     // offset should be -1

src/test/java/redis/clients/jedis/commands/unified/BitCommandsTestBase.java

@@ -35,14 +35,16 @@ public void bitpos() {
     String foo = "foo";
 
     jedis.set(foo, String.valueOf(0));
+    //  string "0" with bits: 0011 0000
 
     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
+     * bit:  00110001 / 00000100 / 00000000 / 00000000 / 00000001
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(foo, true);
     assertEquals(2, offset);
@@ -69,14 +71,16 @@ public void bitposBinary() {
     byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
 
     jedis.set(bfoo, Protocol.toByteArray(0));
+    // bits: 0011 0000
 
     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
+     * bit:  00110001 / 00000100 / 00000000 / 00000000 / 00000001
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(bfoo, true);
     assertEquals(2, offset);
@@ -107,7 +111,8 @@ public void bitposWithNoMatchingBitExist() {
     }
 
     /*
-     * byte: 0 bit: 11111111
+     * bit:  11111111
+     * byte: 0
      */
     long offset = jedis.bitpos(foo, false);
     // offset should be last index + 1
@@ -124,7 +129,8 @@ public void bitposWithNoMatchingBitExistWithinRange() {
     }
 
     /*
-     * byte: 0 1 2 3 4 bit: 11111111 / 11111111 / 11111111 / 11111111 / 11111111
+     * bit:  11111111 / 11111111 / 11111111 / 11111111 / 11111111
+     * byte: 0          1          2          3          4
      */
     long offset = jedis.bitpos(foo, false, new BitPosParams(2, 3));
     // offset should be -1