Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
This commit is contained in:
Jonathan Leibiusky
2010-11-15 23:55:57 -03:00
41 changed files with 8489 additions and 2326 deletions

View File

@@ -3,6 +3,7 @@ package redis.clients.jedis.tests.commands;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.Before;
@@ -10,105 +11,190 @@ import org.junit.Test;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisException;
import redis.clients.jedis.Protocol;
import redis.clients.jedis.Transaction;
import redis.clients.jedis.TransactionBlock;
import redis.clients.jedis.Protocol.Keyword;
public class TransactionCommandsTest extends JedisCommandTestBase {
Jedis nj;
@Before
public void setUp() throws Exception {
super.setUp();
final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 };
final byte[] ba = { 0x0A };
final byte[] bb = { 0x0B };
nj = new Jedis(hnp.host, hnp.port, 500);
nj.connect();
nj.auth("foobared");
nj.flushAll();
}
final byte[] bmykey = { 0x42, 0x02, 0x03, 0x04 };
Jedis nj;
@Before
public void setUp() throws Exception {
super.setUp();
nj = new Jedis(hnp.host, hnp.port, 500);
nj.connect();
nj.auth("foobared");
nj.flushAll();
}
@Test
public void multi() {
Transaction trans = jedis.multi();
Transaction trans = jedis.multi();
String status = trans.sadd("foo", "a");
assertEquals("QUEUED", status);
String status = trans.sadd("foo", "a");
assertEquals(Keyword.QUEUED.name(), status);
status = trans.sadd("foo", "b");
assertEquals("QUEUED", status);
status = trans.sadd("foo", "b");
assertEquals(Keyword.QUEUED.name(), status);
status = trans.scard("foo");
assertEquals("QUEUED", status);
status = trans.scard("foo");
assertEquals(Keyword.QUEUED.name(), status);
List<Object> response = trans.exec();
List<Object> response = trans.exec();
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
// Binary
trans = jedis.multi();
status = trans.sadd(bfoo, ba);
assertEquals(Keyword.QUEUED.name(), status);
status = trans.sadd(bfoo, bb);
assertEquals(Keyword.QUEUED.name(), status);
status = trans.scard(bfoo);
assertEquals(Keyword.QUEUED.name(), status);
response = trans.exec();
expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
}
@Test
public void multiBlock() {
List<Object> response = jedis.multi(new TransactionBlock() {
public void execute() {
String status = sadd("foo", "a");
assertEquals("QUEUED", status);
List<Object> response = jedis.multi(new TransactionBlock() {
public void execute() {
String status = sadd("foo", "a");
assertEquals(Keyword.QUEUED.name(), status);
status = sadd("foo", "b");
assertEquals("QUEUED", status);
status = sadd("foo", "b");
assertEquals(Keyword.QUEUED.name(), status);
status = scard("foo");
assertEquals("QUEUED", status);
}
});
status = scard("foo");
assertEquals(Keyword.QUEUED.name(), status);
}
});
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
// Binary
response = jedis.multi(new TransactionBlock() {
public void execute() {
String status = sadd(bfoo, ba);
assertEquals(Keyword.QUEUED.name(), status);
status = sadd(bfoo, bb);
assertEquals(Keyword.QUEUED.name(), status);
status = scard(bfoo);
assertEquals(Keyword.QUEUED.name(), status);
}
});
expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
List<Object> expected = new ArrayList<Object>();
expected.add(1);
expected.add(1);
expected.add(2);
assertEquals(expected, response);
}
@Test
public void watch() throws UnknownHostException, IOException {
jedis.watch("mykey");
Transaction t = jedis.multi();
jedis.watch("mykey");
Transaction t = jedis.multi();
nj.connect();
nj.auth("foobared");
nj.set("mykey", "bar");
nj.disconnect();
nj.connect();
nj.auth("foobared");
nj.set("mykey", "bar");
nj.disconnect();
t.set("mykey", "foo");
List<Object> resp = t.exec();
assertEquals(null, resp);
assertEquals("bar", jedis.get("mykey"));
t.set("mykey", "foo");
List<Object> resp = t.exec();
assertEquals(null, resp);
assertEquals("bar", jedis.get("mykey"));
// Binary
jedis.watch(bmykey);
t = jedis.multi();
nj.connect();
nj.auth("foobared");
nj.set(bmykey, bbar);
nj.disconnect();
t.set(bmykey, bfoo);
resp = t.exec();
assertEquals(null, resp);
assertTrue(Arrays.equals(bbar, jedis.get(bmykey)));
}
@Test
public void unwatch() throws UnknownHostException, IOException {
jedis.watch("mykey");
String val = jedis.get("mykey");
val = "foo";
String status = jedis.unwatch();
assertEquals("OK", status);
Transaction t = jedis.multi();
jedis.watch("mykey");
String val = jedis.get("mykey");
val = "foo";
String status = jedis.unwatch();
assertEquals("OK", status);
Transaction t = jedis.multi();
nj.connect();
nj.auth("foobared");
nj.set("mykey", "bar");
nj.disconnect();
nj.connect();
nj.auth("foobared");
nj.set("mykey", "bar");
nj.disconnect();
t.set("mykey", val);
List<Object> resp = t.exec();
List<Object> expected = new ArrayList<Object>();
expected.add("OK");
assertEquals(expected, resp);
t.set("mykey", val);
List<Object> resp = t.exec();
assertEquals(1, resp.size());
assertArrayEquals(Keyword.OK.name().getBytes(Protocol.UTF8),
(byte[]) resp.get(0));
// Binary
jedis.watch(bmykey);
byte[] bval = jedis.get(bmykey);
bval = bfoo;
status = jedis.unwatch();
assertEquals(Keyword.OK.name(), status);
t = jedis.multi();
nj.connect();
nj.auth("foobared");
nj.set(bmykey, bbar);
nj.disconnect();
t.set(bmykey, bval);
resp = t.exec();
assertEquals(1, resp.size());
assertArrayEquals(Keyword.OK.name().getBytes(Protocol.UTF8),
(byte[]) resp.get(0));
}
@Test(expected = JedisException.class)
public void validateWhenInMulti() {
jedis.multi();
jedis.ping();
jedis.multi();
jedis.ping();
}
}