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

incr/decr operate on 64-bit numbers. Switching from Integer to Long

Browse Source
This commit is contained in:
Neil Gentleman
2010-11-23 16:52:18 -08:00
committed by Jonathan Leibiusky
parent a1815f3881
commit d18cc4bd13
20 changed files with 397 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/redis/clients/jedis/tests/ProtocolTest.java
View File

@@ -77,7 +77,7 @@ public class ProtocolTest extends JedisTestBase {
public void integerReply() {
InputStream is = new ByteArrayInputStream(":123\r\n".getBytes());
Protocol protocol = new Protocol();
int response = (Integer) protocol.read(new RedisInputStream(is));
long response = (Long) protocol.read(new RedisInputStream(is));
assertEquals(123, response);
}

30
src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java
View File

@@ -37,7 +37,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
status = jedis.set(bfoo, bbar);
assertEquals("OK", status);
int reply = jedis.exists("foo");
long reply = jedis.exists("foo");
assertEquals(1, reply);
reply = jedis.exists(bfoo);
@@ -62,7 +62,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
jedis.set("foo2", "bar2");
jedis.set("foo3", "bar3");
int reply = jedis.del("foo1", "foo2", "foo3");
long reply = jedis.del("foo1", "foo2", "foo3");
assertEquals(3, reply);
reply = jedis.exists("foo1");
@@ -222,7 +222,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@Test
public void renamenx() {
jedis.set("foo", "bar");
int status = jedis.renamenx("foo", "bar");
long status = jedis.renamenx("foo", "bar");
assertEquals(1, status);
jedis.set("foo", "bar");
@@ -231,7 +231,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
// Binary
jedis.set(bfoo, bbar);
int bstatus = jedis.renamenx(bfoo, bbar);
long bstatus = jedis.renamenx(bfoo, bbar);
assertEquals(1, bstatus);
jedis.set(bfoo, bbar);
@@ -242,7 +242,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@Test
public void dbSize() {
int size = jedis.dbSize();
long size = jedis.dbSize();
assertEquals(0, size);
jedis.set("foo", "bar");
@@ -257,7 +257,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@Test
public void expire() {
int status = jedis.expire("foo", 20);
long status = jedis.expire("foo", 20);
assertEquals(0, status);
jedis.set("foo", "bar");
@@ -265,7 +265,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
assertEquals(1, status);
// Binary
int bstatus = jedis.expire(bfoo, 20);
long bstatus = jedis.expire(bfoo, 20);
assertEquals(0, bstatus);
jedis.set(bfoo, bbar);
@@ -278,7 +278,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
public void expireAt() {
long unixTime = (System.currentTimeMillis() / 1000L) + 20;
int status = jedis.expireAt("foo", unixTime);
long status = jedis.expireAt("foo", unixTime);
assertEquals(0, status);
jedis.set("foo", "bar");
@@ -287,7 +287,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
assertEquals(1, status);
// Binary
int bstatus = jedis.expireAt(bfoo, unixTime);
long bstatus = jedis.expireAt(bfoo, unixTime);
assertEquals(0, bstatus);
jedis.set(bfoo, bbar);
@@ -299,7 +299,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@Test
public void ttl() {
int ttl = jedis.ttl("foo");
long ttl = jedis.ttl("foo");
assertEquals(-1, ttl);
jedis.set("foo", "bar");
@@ -311,7 +311,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
assertTrue(ttl >= 0 && ttl <= 20);
// Binary
int bttl = jedis.ttl(bfoo);
long bttl = jedis.ttl(bfoo);
assertEquals(-1, bttl);
jedis.set(bfoo, bbar);
@@ -345,7 +345,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@Test
public void move() {
int status = jedis.move("foo", 1);
long status = jedis.move("foo", 1);
assertEquals(0, status);
jedis.set("foo", "bar");
@@ -358,7 +358,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
// Binary
jedis.select(0);
int bstatus = jedis.move(bfoo, 1);
long bstatus = jedis.move(bfoo, 1);
assertEquals(0, bstatus);
jedis.set(bfoo, bbar);
@@ -428,14 +428,14 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
public void persist() {
jedis.setex("foo", 60 * 60, "bar");
assertTrue(jedis.ttl("foo") > 0);
int status = jedis.persist("foo");
long status = jedis.persist("foo");
assertEquals(1, status);
assertEquals(-1, jedis.ttl("foo").intValue());
// Binary
jedis.setex(bfoo, 60 * 60, bbar);
assertTrue(jedis.ttl(bfoo) > 0);
int bstatus = jedis.persist(bfoo);
long bstatus = jedis.persist(bfoo);
assertEquals(1, bstatus);
assertEquals(-1, jedis.ttl(bfoo).intValue());

16
src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java
View File

@@ -75,7 +75,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void setnx() {
int status = jedis.setnx(bfoo, binaryValue);
long status = jedis.setnx(bfoo, binaryValue);
assertEquals(1, status);
assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
@@ -88,7 +88,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
public void setex() {
String status = jedis.setex(bfoo, 20, binaryValue);
assertEquals(Keyword.OK.name(), status);
int ttl = jedis.ttl(bfoo);
long ttl = jedis.ttl(bfoo);
assertTrue(ttl > 0 && ttl <= 20);
}
@@ -102,7 +102,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void msetnx() {
int status = jedis.msetnx(bfoo, binaryValue, bbar, bfoo);
long status = jedis.msetnx(bfoo, binaryValue, bbar, bfoo);
assertEquals(1, status);
assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
assertTrue(Arrays.equals(bfoo, jedis.get(bbar)));
@@ -121,7 +121,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void incr() {
int value = jedis.incr(bfoo);
long value = jedis.incr(bfoo);
assertEquals(1, value);
value = jedis.incr(bfoo);
assertEquals(2, value);
@@ -135,7 +135,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void incrBy() {
int value = jedis.incrBy(bfoo, 2);
long value = jedis.incrBy(bfoo, 2);
assertEquals(2, value);
value = jedis.incrBy(bfoo, 2);
assertEquals(4, value);
@@ -149,7 +149,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void decr() {
int value = jedis.decr(bfoo);
long value = jedis.decr(bfoo);
assertEquals(-1, value);
value = jedis.decr(bfoo);
assertEquals(-2, value);
@@ -163,7 +163,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
@Test
public void decrBy() {
int value = jedis.decrBy(bfoo, 2);
long value = jedis.decrBy(bfoo, 2);
assertEquals(-2, value);
value = jedis.decrBy(bfoo, 2);
assertEquals(-4, value);
@@ -173,7 +173,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
public void append() {
byte[] first512 = new byte[512];
System.arraycopy(binaryValue, 0, first512, 0, 512);
int value = jedis.append(bfoo, first512);
long value = jedis.append(bfoo, first512);
assertEquals(512, value);
assertTrue(Arrays.equals(first512, jedis.get(bfoo)));

7
src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
View File

@@ -35,7 +35,7 @@ public class ControlCommandsTest extends JedisCommandTestBase {
@Test
public void lastsave() throws InterruptedException {
int before = jedis.lastsave();
long before = jedis.lastsave();
String st = "";
while (!st.equals("OK")) {
try {
@@ -45,7 +45,7 @@ public class ControlCommandsTest extends JedisCommandTestBase {
}
}
int after = jedis.lastsave();
long after = jedis.lastsave();
assertTrue((after - before) > 0);
}
@@ -58,7 +58,8 @@ public class ControlCommandsTest extends JedisCommandTestBase {
@Test
public void monitor() {
jedis.monitor(new JedisMonitor() {
public void onCommand(String command) {
@Override
public void onCommand(String command) {
assertTrue(command.contains("OK"));
client.disconnect();
}

12
src/test/java/redis/clients/jedis/tests/commands/HashesCommandsTest.java
View File

@@ -17,13 +17,13 @@ public class HashesCommandsTest extends JedisCommandTestBase {
@Test
public void hset() {
int status = jedis.hset("foo", "bar", "car");
long status = jedis.hset("foo", "bar", "car");
assertEquals(1, status);
status = jedis.hset("foo", "bar", "foo");
assertEquals(0, status);
// Binary
int bstatus = jedis.hset(bfoo, bbar, bcar);
long bstatus = jedis.hset(bfoo, bbar, bcar);
assertEquals(1, bstatus);
bstatus = jedis.hset(bfoo, bbar, bfoo);
assertEquals(0, bstatus);
@@ -46,7 +46,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
@Test
public void hsetnx() {
int status = jedis.hsetnx("foo", "bar", "car");
long status = jedis.hsetnx("foo", "bar", "car");
assertEquals(1, status);
assertEquals("car", jedis.hget("foo", "bar"));
@@ -59,7 +59,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
assertEquals("bar", jedis.hget("foo", "car"));
// Binary
int bstatus = jedis.hsetnx(bfoo, bbar, bcar);
long bstatus = jedis.hsetnx(bfoo, bbar, bcar);
assertEquals(1, bstatus);
assertArrayEquals(bcar, jedis.hget(bfoo, bbar));
@@ -126,7 +126,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
@Test
public void hincrBy() {
int value = jedis.hincrBy("foo", "bar", 1);
long value = jedis.hincrBy("foo", "bar", 1);
assertEquals(1, value);
value = jedis.hincrBy("foo", "bar", -1);
assertEquals(0, value);
@@ -134,7 +134,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
assertEquals(-10, value);
// Binary
int bvalue = jedis.hincrBy(bfoo, bbar, 1);
long bvalue = jedis.hincrBy(bfoo, bbar, 1);
assertEquals(1, bvalue);
bvalue = jedis.hincrBy(bfoo, bbar, -1);
assertEquals(0, bvalue);

24
src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java
View File

@@ -25,13 +25,13 @@ public class ListCommandsTest extends JedisCommandTestBase {
@Test
public void rpush() {
int size = jedis.rpush("foo", "bar");
long size = jedis.rpush("foo", "bar");
assertEquals(1, size);
size = jedis.rpush("foo", "foo");
assertEquals(2, size);
// Binary
int bsize = jedis.rpush(bfoo, bbar);
long bsize = jedis.rpush(bfoo, bbar);
assertEquals(1, bsize);
bsize = jedis.rpush(bfoo, bfoo);
assertEquals(2, bsize);
@@ -40,13 +40,13 @@ public class ListCommandsTest extends JedisCommandTestBase {
@Test
public void lpush() {
int size = jedis.lpush("foo", "bar");
long size = jedis.lpush("foo", "bar");
assertEquals(1, size);
size = jedis.lpush("foo", "foo");
assertEquals(2, size);
// Binary
int bsize = jedis.lpush(bfoo, bbar);
long bsize = jedis.lpush(bfoo, bbar);
assertEquals(1, bsize);
bsize = jedis.lpush(bfoo, bfoo);
assertEquals(2, bsize);
@@ -236,7 +236,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
jedis.lpush("foo", "b");
jedis.lpush("foo", "a");
int count = jedis.lrem("foo", -2, "hello");
long count = jedis.lrem("foo", -2, "hello");
List<String> expected = new ArrayList<String>();
expected.add("a");
@@ -258,7 +258,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
jedis.lpush(bfoo, bB);
jedis.lpush(bfoo, bA);
int bcount = jedis.lrem(bfoo, -2, bhello);
long bcount = jedis.lrem(bfoo, -2, bhello);
List<byte[]> bexpected = new ArrayList<byte[]>();
bexpected.add(bA);
@@ -502,7 +502,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
@Test
public void lpushx() {
int status = jedis.lpushx("foo", "bar");
long status = jedis.lpushx("foo", "bar");
assertEquals(0, status);
jedis.lpush("foo", "a");
@@ -510,7 +510,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
assertEquals(2, status);
// Binary
int bstatus = jedis.lpushx(bfoo, bbar);
long bstatus = jedis.lpushx(bfoo, bbar);
assertEquals(0, bstatus);
jedis.lpush(bfoo, bA);
@@ -521,7 +521,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
@Test
public void rpushx() {
int status = jedis.rpushx("foo", "bar");
long status = jedis.rpushx("foo", "bar");
assertEquals(0, status);
jedis.lpush("foo", "a");
@@ -529,7 +529,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
assertEquals(2, status);
// Binary
int bstatus = jedis.rpushx(bfoo, bbar);
long bstatus = jedis.rpushx(bfoo, bbar);
assertEquals(0, bstatus);
jedis.lpush(bfoo, bA);
@@ -539,7 +539,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
@Test
public void linsert() {
int status = jedis.linsert("foo", Client.LIST_POSITION.BEFORE, "bar",
long status = jedis.linsert("foo", Client.LIST_POSITION.BEFORE, "bar",
"car");
assertEquals(0, status);
@@ -559,7 +559,7 @@ public class ListCommandsTest extends JedisCommandTestBase {
assertEquals(-1, status);
// Binary
int bstatus = jedis.linsert(bfoo, Client.LIST_POSITION.BEFORE, bbar,
long bstatus = jedis.linsert(bfoo, Client.LIST_POSITION.BEFORE, bbar,
bcar);
assertEquals(0, bstatus);

32
src/test/java/redis/clients/jedis/tests/commands/SetCommandsTest.java
View File

@@ -18,13 +18,13 @@ public class SetCommandsTest extends JedisCommandTestBase {
@Test
public void sadd() {
int status = jedis.sadd("foo", "a");
long status = jedis.sadd("foo", "a");
assertEquals(1, status);
status = jedis.sadd("foo", "a");
assertEquals(0, status);
int bstatus = jedis.sadd(bfoo, ba);
long bstatus = jedis.sadd(bfoo, ba);
assertEquals(1, bstatus);
bstatus = jedis.sadd(bfoo, ba);
@@ -63,7 +63,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd("foo", "a");
jedis.sadd("foo", "b");
int status = jedis.srem("foo", "a");
long status = jedis.srem("foo", "a");
Set<String> expected = new LinkedHashSet<String>();
expected.add("b");
@@ -80,7 +80,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd(bfoo, ba);
jedis.sadd(bfoo, bb);
int bstatus = jedis.srem(bfoo, ba);
long bstatus = jedis.srem(bfoo, ba);
Set<byte[]> bexpected = new LinkedHashSet<byte[]>();
bexpected.add(bb);
@@ -128,7 +128,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd("bar", "c");
int status = jedis.smove("foo", "bar", "a");
long status = jedis.smove("foo", "bar", "a");
Set<String> expectedSrc = new LinkedHashSet<String>();
expectedSrc.add("b");
@@ -151,7 +151,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd(bbar, bc);
int bstatus = jedis.smove(bfoo, bbar, ba);
long bstatus = jedis.smove(bfoo, bbar, ba);
Set<byte[]> bexpectedSrc = new LinkedHashSet<byte[]>();
bexpectedSrc.add(bb);
@@ -174,7 +174,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd("foo", "a");
jedis.sadd("foo", "b");
int card = jedis.scard("foo");
long card = jedis.scard("foo");
assertEquals(2, card);
@@ -185,7 +185,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd(bfoo, ba);
jedis.sadd(bfoo, bb);
int bcard = jedis.scard(bfoo);
long bcard = jedis.scard(bfoo);
assertEquals(2, bcard);
@@ -199,7 +199,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd("foo", "a");
jedis.sadd("foo", "b");
int status = jedis.sismember("foo", "a");
long status = jedis.sismember("foo", "a");
assertEquals(1, status);
status = jedis.sismember("foo", "c");
@@ -209,7 +209,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd(bfoo, ba);
jedis.sadd(bfoo, bb);
int bstatus = jedis.sismember(bfoo, ba);
long bstatus = jedis.sismember(bfoo, ba);
assertEquals(1, bstatus);
bstatus = jedis.sismember(bfoo, bc);
@@ -256,7 +256,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
Set<String> expected = new LinkedHashSet<String>();
expected.add("b");
int status = jedis.sinterstore("car", "foo", "bar");
long status = jedis.sinterstore("car", "foo", "bar");
assertEquals(1, status);
assertEquals(expected, jedis.smembers("car"));
@@ -271,7 +271,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
Set<byte[]> bexpected = new LinkedHashSet<byte[]>();
bexpected.add(bb);
int bstatus = jedis.sinterstore(bcar, bfoo, bbar);
long bstatus = jedis.sinterstore(bcar, bfoo, bbar);
assertEquals(1, bstatus);
assertEquals(bexpected, jedis.smembers(bcar));
@@ -324,7 +324,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
expected.add("b");
expected.add("c");
int status = jedis.sunionstore("car", "foo", "bar");
long status = jedis.sunionstore("car", "foo", "bar");
assertEquals(3, status);
assertEquals(expected, jedis.smembers("car"));
@@ -341,7 +341,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
bexpected.add(bc);
bexpected.add(ba);
int bstatus = jedis.sunionstore(bcar, bfoo, bbar);
long bstatus = jedis.sunionstore(bcar, bfoo, bbar);
assertEquals(3, bstatus);
assertEquals(bexpected, jedis.smembers(bcar));
@@ -403,7 +403,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
expected.add("d");
expected.add("a");
int status = jedis.sdiffstore("tar", "foo", "bar", "car");
long status = jedis.sdiffstore("tar", "foo", "bar", "car");
assertEquals(2, status);
assertEquals(expected, jedis.smembers("car"));
@@ -422,7 +422,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
bexpected.add(bd);
bexpected.add(ba);
int bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
long bstatus = jedis.sdiffstore("tar".getBytes(), bfoo, bbar, bcar);
assertEquals(2, bstatus);
assertEquals(bexpected, jedis.smembers(bcar));

62
src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
View File

@@ -19,7 +19,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
@Test
public void zadd() {
int status = jedis.zadd("foo", 1d, "a");
long status = jedis.zadd("foo", 1d, "a");
assertEquals(1, status);
status = jedis.zadd("foo", 10d, "b");
@@ -32,7 +32,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
assertEquals(0, status);
// Binary
int bstatus = jedis.zadd(bfoo, 1d, ba);
long bstatus = jedis.zadd(bfoo, 1d, ba);
assertEquals(1, bstatus);
bstatus = jedis.zadd(bfoo, 10d, bb);
@@ -125,7 +125,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 1d, "a");
jedis.zadd("foo", 2d, "b");
int status = jedis.zrem("foo", "a");
long status = jedis.zrem("foo", "a");
Set<String> expected = new LinkedHashSet<String>();
expected.add("b");
@@ -141,7 +141,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 1d, ba);
jedis.zadd(bfoo, 2d, bb);
int bstatus = jedis.zrem(bfoo, ba);
long bstatus = jedis.zrem(bfoo, ba);
Set<byte[]> bexpected = new LinkedHashSet<byte[]>();
bexpected.add(bb);
@@ -189,27 +189,25 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 1d, "a");
jedis.zadd("foo", 2d, "b");
Integer rank = jedis.zrank("foo", "a");
assertEquals(0, rank.intValue());
long rank = jedis.zrank("foo", "a");
assertEquals(0, rank);
rank = jedis.zrank("foo", "b");
assertEquals(1, rank.intValue());
assertEquals(1, rank);
rank = jedis.zrank("car", "b");
assertNull(rank);
assertNull(jedis.zrank("car", "b"));
// Binary
jedis.zadd(bfoo, 1d, ba);
jedis.zadd(bfoo, 2d, bb);
Integer brank = jedis.zrank(bfoo, ba);
assertEquals(0, brank.intValue());
long brank = jedis.zrank(bfoo, ba);
assertEquals(0, brank);
brank = jedis.zrank(bfoo, bb);
assertEquals(1, brank.intValue());
assertEquals(1, brank);
brank = jedis.zrank(bcar, bb);
assertNull(brank);
assertNull(jedis.zrank(bcar, bb));
}
@@ -218,7 +216,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 1d, "a");
jedis.zadd("foo", 2d, "b");
int rank = jedis.zrevrank("foo", "a");
long rank = jedis.zrevrank("foo", "a");
assertEquals(1, rank);
rank = jedis.zrevrank("foo", "b");
@@ -228,7 +226,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 1d, ba);
jedis.zadd(bfoo, 2d, bb);
int brank = jedis.zrevrank(bfoo, ba);
long brank = jedis.zrevrank(bfoo, ba);
assertEquals(1, brank);
brank = jedis.zrevrank(bfoo, bb);
@@ -317,7 +315,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 0.1d, "c");
jedis.zadd("foo", 2d, "a");
int size = jedis.zcard("foo");
long size = jedis.zcard("foo");
assertEquals(3, size);
// Binary
@@ -326,7 +324,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 0.1d, bc);
jedis.zadd(bfoo, 2d, ba);
int bsize = jedis.zcard(bfoo);
long bsize = jedis.zcard(bfoo);
assertEquals(3, bsize);
}
@@ -371,7 +369,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 0.1d, "c");
jedis.zadd("foo", 2d, "a");
int result = jedis.zcount("foo", 0.01d, 2.1d);
long result = jedis.zcount("foo", 0.01d, 2.1d);
assertEquals(2, result);
@@ -381,7 +379,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 0.1d, bc);
jedis.zadd(bfoo, 2d, ba);
int bresult = jedis.zcount(bfoo, 0.01d, 2.1d);
long bresult = jedis.zcount(bfoo, 0.01d, 2.1d);
assertEquals(2, bresult);
@@ -518,7 +516,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 0.1d, "c");
jedis.zadd("foo", 2d, "a");
int result = jedis.zremrangeByRank("foo", 0, 0);
long result = jedis.zremrangeByRank("foo", 0, 0);
assertEquals(1, result);
@@ -534,7 +532,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 0.1d, bc);
jedis.zadd(bfoo, 2d, ba);
int bresult = jedis.zremrangeByRank(bfoo, 0, 0);
long bresult = jedis.zremrangeByRank(bfoo, 0, 0);
assertEquals(1, bresult);
@@ -553,7 +551,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 0.1d, "c");
jedis.zadd("foo", 2d, "a");
int result = jedis.zremrangeByScore("foo", 0, 2);
long result = jedis.zremrangeByScore("foo", 0, 2);
assertEquals(2, result);
@@ -568,7 +566,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 0.1d, bc);
jedis.zadd(bfoo, 2d, ba);
int bresult = jedis.zremrangeByScore(bfoo, 0, 2);
long bresult = jedis.zremrangeByScore(bfoo, 0, 2);
assertEquals(2, bresult);
@@ -585,7 +583,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("bar", 2, "a");
jedis.zadd("bar", 2, "b");
int result = jedis.zunionstore("dst", "foo", "bar");
long result = jedis.zunionstore("dst", "foo", "bar");
assertEquals(2, result);
@@ -601,7 +599,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bbar, 2, ba);
jedis.zadd(bbar, 2, bb);
int bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar);
long bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bfoo, bbar);
assertEquals(2, bresult);
@@ -623,7 +621,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
ZParams params = new ZParams();
params.weights(2, 2);
params.aggregate(ZParams.Aggregate.SUM);
int result = jedis.zunionstore("dst", params, "foo", "bar");
long result = jedis.zunionstore("dst", params, "foo", "bar");
assertEquals(2, result);
@@ -642,7 +640,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
ZParams bparams = new ZParams();
bparams.weights(2, 2);
bparams.aggregate(ZParams.Aggregate.SUM);
int bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bparams,
long bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bparams,
bfoo, bbar);
assertEquals(2, bresult);
@@ -661,7 +659,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd("foo", 2, "b");
jedis.zadd("bar", 2, "a");
int result = jedis.zinterstore("dst", "foo", "bar");
long result = jedis.zinterstore("dst", "foo", "bar");
assertEquals(1, result);
@@ -675,7 +673,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
jedis.zadd(bfoo, 2, bb);
jedis.zadd(bbar, 2, ba);
int bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar);
long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bfoo, bbar);
assertEquals(1, bresult);
@@ -695,7 +693,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
ZParams params = new ZParams();
params.weights(2, 2);
params.aggregate(ZParams.Aggregate.SUM);
int result = jedis.zinterstore("dst", params, "foo", "bar");
long result = jedis.zinterstore("dst", params, "foo", "bar");
assertEquals(1, result);
@@ -712,7 +710,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
ZParams bparams = new ZParams();
bparams.weights(2, 2);
bparams.aggregate(ZParams.Aggregate.SUM);
int bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams,
long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams,
bfoo, bbar);
assertEquals(1, bresult);

4
src/test/java/redis/clients/jedis/tests/commands/SortingCommandsTest.java
View File

@@ -271,7 +271,7 @@ public class SortingCommandsTest extends JedisCommandTestBase {
jedis.lpush("foo", "2");
jedis.lpush("foo", "10");
int result = jedis.sort("foo", "result");
long result = jedis.sort("foo", "result");
List<String> expected = new ArrayList<String>();
expected.add("1");
@@ -287,7 +287,7 @@ public class SortingCommandsTest extends JedisCommandTestBase {
jedis.lpush(bfoo, b10);
byte[] bkresult = new byte[] { 0X09, 0x0A, 0x0B, 0x0C };
int bresult = jedis.sort(bfoo, bkresult);
long bresult = jedis.sort(bfoo, bkresult);
List<byte[]> bexpected = new ArrayList<byte[]>();
bexpected.add(b1);

16
src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java
View File

@@ -57,7 +57,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void setnx() {
int status = jedis.setnx("foo", "bar");
long status = jedis.setnx("foo", "bar");
assertEquals(1, status);
assertEquals("bar", jedis.get("foo"));
@@ -70,7 +70,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
public void setex() {
String status = jedis.setex("foo", 20, "bar");
assertEquals("OK", status);
int ttl = jedis.ttl("foo");
long ttl = jedis.ttl("foo");
assertTrue(ttl > 0 && ttl <= 20);
}
@@ -84,7 +84,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void msetnx() {
int status = jedis.msetnx("foo", "bar", "bar", "foo");
long status = jedis.msetnx("foo", "bar", "bar", "foo");
assertEquals(1, status);
assertEquals("bar", jedis.get("foo"));
assertEquals("foo", jedis.get("bar"));
@@ -103,7 +103,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void incr() {
int value = jedis.incr("foo");
long value = jedis.incr("foo");
assertEquals(1, value);
value = jedis.incr("foo");
assertEquals(2, value);
@@ -117,7 +117,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void incrBy() {
int value = jedis.incrBy("foo", 2);
long value = jedis.incrBy("foo", 2);
assertEquals(2, value);
value = jedis.incrBy("foo", 2);
assertEquals(4, value);
@@ -131,7 +131,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void decr() {
int value = jedis.decr("foo");
long value = jedis.decr("foo");
assertEquals(-1, value);
value = jedis.decr("foo");
assertEquals(-2, value);
@@ -145,7 +145,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void decrBy() {
int value = jedis.decrBy("foo", 2);
long value = jedis.decrBy("foo", 2);
assertEquals(-2, value);
value = jedis.decrBy("foo", 2);
assertEquals(-4, value);
@@ -153,7 +153,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
@Test
public void append() {
int value = jedis.append("foo", "bar");
long value = jedis.append("foo", "bar");
assertEquals(3, value);
assertEquals("bar", jedis.get("foo"));
value = jedis.append("foo", "bar");

33
src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
View File

@@ -26,7 +26,8 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
Jedis nj;
@Before
@Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -52,9 +53,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
List<Object> response = trans.exec();
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
expected.add(1L);
expected.add(1L);
expected.add(2L);
assertEquals(expected, response);
// Binary
@@ -72,9 +73,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
response = trans.exec();
expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
expected.add(1L);
expected.add(1L);
expected.add(2L);
assertEquals(expected, response);
}
@@ -82,7 +83,8 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
@Test
public void multiBlock() {
List<Object> response = jedis.multi(new TransactionBlock() {
public void execute() {
@Override
public void execute() {
String status = sadd("foo", "a");
assertEquals(Keyword.QUEUED.name(), status);
@@ -95,14 +97,15 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
});
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
expected.add(1L);
expected.add(1L);
expected.add(2L);
assertEquals(expected, response);
// Binary
response = jedis.multi(new TransactionBlock() {
public void execute() {
@Override
public void execute() {
String status = sadd(bfoo, ba);
assertEquals(Keyword.QUEUED.name(), status);
@@ -115,9 +118,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
});
expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
expected.add(1L);
expected.add(1L);
expected.add(2L);
assertEquals(expected, response);
}