add watch on several keys, and discard status return

This commit is contained in:
Jonathan Leibiusky
2010-11-21 21:00:40 -03:00
parent 098de44a07
commit 970ea3adf4
6 changed files with 830 additions and 816 deletions

View File

@@ -396,8 +396,8 @@ public class BinaryClient extends Connection {
isInMulti = false; isInMulti = false;
} }
public void watch(final byte[] key) { public void watch(final byte[]... keys) {
sendCommand(WATCH, key); sendCommand(WATCH, keys);
} }
public void unwatch() { public void unwatch() {

View File

@@ -4,427 +4,430 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public class BinaryTransaction { public class BinaryTransaction {
protected Client client = null; protected Client client = null;
protected boolean inTransaction = true;
public BinaryTransaction() {
} public BinaryTransaction() {
}
public BinaryTransaction(final Client client) {
this.client = client; public BinaryTransaction(final Client client) {
} this.client = client;
}
public String ping() {
client.ping(); public String ping() {
return client.getStatusCodeReply(); client.ping();
} return client.getStatusCodeReply();
}
public String set(final byte[] key, final byte[] value) {
client.set(key, value); public String set(final byte[] key, final byte[] value) {
return client.getStatusCodeReply(); client.set(key, value);
} return client.getStatusCodeReply();
}
public String get(final byte[] key) {
client.get(key); public String get(final byte[] key) {
return client.getStatusCodeReply(); client.get(key);
} return client.getStatusCodeReply();
}
public String exists(final byte[] key) {
client.exists(key); public String exists(final byte[] key) {
return client.getStatusCodeReply(); client.exists(key);
} return client.getStatusCodeReply();
}
public String del(final byte[]... keys) {
client.del(keys); public String del(final byte[]... keys) {
return client.getStatusCodeReply(); client.del(keys);
} return client.getStatusCodeReply();
}
public String type(final byte[] key) {
client.type(key); public String type(final byte[] key) {
return client.getStatusCodeReply(); client.type(key);
} return client.getStatusCodeReply();
}
public String flushDB() {
client.flushDB(); public String flushDB() {
return client.getStatusCodeReply(); client.flushDB();
} return client.getStatusCodeReply();
}
public String keys(final byte[] pattern) {
client.keys(pattern); public String keys(final byte[] pattern) {
return client.getStatusCodeReply(); client.keys(pattern);
} return client.getStatusCodeReply();
}
public byte[] randomBinaryKey() {
client.randomKey(); public byte[] randomBinaryKey() {
return client.getBinaryBulkReply(); client.randomKey();
} return client.getBinaryBulkReply();
}
public String rename(final byte[] oldkey, final byte[] newkey) {
client.rename(oldkey, newkey); public String rename(final byte[] oldkey, final byte[] newkey) {
return client.getStatusCodeReply(); client.rename(oldkey, newkey);
} return client.getStatusCodeReply();
}
public String renamenx(final byte[] oldkey, final byte[] newkey) {
client.renamenx(oldkey, newkey); public String renamenx(final byte[] oldkey, final byte[] newkey) {
return client.getStatusCodeReply(); client.renamenx(oldkey, newkey);
} return client.getStatusCodeReply();
}
public String dbSize() {
client.dbSize(); public String dbSize() {
return client.getStatusCodeReply(); client.dbSize();
} return client.getStatusCodeReply();
}
public String expire(final byte[] key, final int seconds) {
client.expire(key, seconds); public String expire(final byte[] key, final int seconds) {
return client.getStatusCodeReply(); client.expire(key, seconds);
} return client.getStatusCodeReply();
}
public String expireAt(final byte[] key, final long unixTime) {
client.expireAt(key, unixTime); public String expireAt(final byte[] key, final long unixTime) {
return client.getStatusCodeReply(); client.expireAt(key, unixTime);
} return client.getStatusCodeReply();
}
public String ttl(final byte[] key) {
client.ttl(key); public String ttl(final byte[] key) {
return client.getStatusCodeReply(); client.ttl(key);
} return client.getStatusCodeReply();
}
public String select(final int index) {
client.select(index); public String select(final int index) {
return client.getStatusCodeReply(); client.select(index);
} return client.getStatusCodeReply();
}
public String move(final byte[] key, final int dbIndex) {
client.move(key, dbIndex); public String move(final byte[] key, final int dbIndex) {
return client.getStatusCodeReply(); client.move(key, dbIndex);
} return client.getStatusCodeReply();
}
public String flushAll() {
client.flushAll(); public String flushAll() {
return client.getStatusCodeReply(); client.flushAll();
} return client.getStatusCodeReply();
}
public String getSet(final byte[] key, final byte[] value) {
client.getSet(key, value); public String getSet(final byte[] key, final byte[] value) {
return client.getStatusCodeReply(); client.getSet(key, value);
} return client.getStatusCodeReply();
}
public String mget(final byte[]... keys) {
client.mget(keys); public String mget(final byte[]... keys) {
return client.getStatusCodeReply(); client.mget(keys);
} return client.getStatusCodeReply();
}
public String setnx(final byte[] key, final byte[] value) {
client.setnx(key, value); public String setnx(final byte[] key, final byte[] value) {
return client.getStatusCodeReply(); client.setnx(key, value);
} return client.getStatusCodeReply();
}
public String setex(final byte[] key, final int seconds, final byte[] value) {
client.setex(key, seconds, value); public String setex(final byte[] key, final int seconds, final byte[] value) {
return client.getStatusCodeReply(); client.setex(key, seconds, value);
} return client.getStatusCodeReply();
}
public String mset(final byte[]... keysvalues) {
client.mset(keysvalues); public String mset(final byte[]... keysvalues) {
return client.getStatusCodeReply(); client.mset(keysvalues);
} return client.getStatusCodeReply();
}
public String msetnx(final byte[]... keysvalues) {
client.msetnx(keysvalues); public String msetnx(final byte[]... keysvalues) {
return client.getStatusCodeReply(); client.msetnx(keysvalues);
} return client.getStatusCodeReply();
}
public String decrBy(final byte[] key, final int integer) {
client.decrBy(key, integer); public String decrBy(final byte[] key, final int integer) {
return client.getStatusCodeReply(); client.decrBy(key, integer);
} return client.getStatusCodeReply();
}
public String decr(final byte[] key) {
client.decr(key); public String decr(final byte[] key) {
return client.getStatusCodeReply(); client.decr(key);
} return client.getStatusCodeReply();
}
public String incrBy(final byte[] key, final int integer) {
client.incrBy(key, integer); public String incrBy(final byte[] key, final int integer) {
return client.getStatusCodeReply(); client.incrBy(key, integer);
} return client.getStatusCodeReply();
}
public String incr(final byte[] key) {
client.incr(key); public String incr(final byte[] key) {
return client.getStatusCodeReply(); client.incr(key);
} return client.getStatusCodeReply();
}
public String append(final byte[] key, final byte[] value) {
client.append(key, value); public String append(final byte[] key, final byte[] value) {
return client.getStatusCodeReply(); client.append(key, value);
} return client.getStatusCodeReply();
}
public String substr(final byte[] key, final int start, final int end) {
client.substr(key, start, end); public String substr(final byte[] key, final int start, final int end) {
return client.getStatusCodeReply(); client.substr(key, start, end);
} return client.getStatusCodeReply();
}
public String hset(final byte[] key, final byte[] field, final byte[] value) {
client.hset(key, field, value); public String hset(final byte[] key, final byte[] field, final byte[] value) {
return client.getStatusCodeReply(); client.hset(key, field, value);
} return client.getStatusCodeReply();
}
public String hget(final byte[] key, final byte[] field) {
client.hget(key, field); public String hget(final byte[] key, final byte[] field) {
return client.getStatusCodeReply(); client.hget(key, field);
} return client.getStatusCodeReply();
}
public String hsetnx(final byte[] key, final byte[] field,
final byte[] value) { public String hsetnx(final byte[] key, final byte[] field,
client.hsetnx(key, field, value); final byte[] value) {
return client.getStatusCodeReply(); client.hsetnx(key, field, value);
} return client.getStatusCodeReply();
}
public String hmset(final byte[] key, final Map<byte[], byte[]> hash) {
client.hmset(key, hash); public String hmset(final byte[] key, final Map<byte[], byte[]> hash) {
return client.getStatusCodeReply(); client.hmset(key, hash);
} return client.getStatusCodeReply();
}
public String hmget(final byte[] key, final byte[]... fields) {
client.hmget(key, fields); public String hmget(final byte[] key, final byte[]... fields) {
return client.getStatusCodeReply(); client.hmget(key, fields);
} return client.getStatusCodeReply();
}
public String hincrBy(final byte[] key, final byte[] field, final int value) {
client.hincrBy(key, field, value); public String hincrBy(final byte[] key, final byte[] field, final int value) {
return client.getStatusCodeReply(); client.hincrBy(key, field, value);
} return client.getStatusCodeReply();
}
public String hexists(final byte[] key, final byte[] field) {
client.hexists(key, field); public String hexists(final byte[] key, final byte[] field) {
return client.getStatusCodeReply(); client.hexists(key, field);
} return client.getStatusCodeReply();
}
public String hdel(final byte[] key, final byte[] field) {
client.hdel(key, field); public String hdel(final byte[] key, final byte[] field) {
return client.getStatusCodeReply(); client.hdel(key, field);
} return client.getStatusCodeReply();
}
public String hlen(final byte[] key) {
client.hlen(key); public String hlen(final byte[] key) {
return client.getStatusCodeReply(); client.hlen(key);
} return client.getStatusCodeReply();
}
public String hkeys(final byte[] key) {
client.hkeys(key); public String hkeys(final byte[] key) {
return client.getStatusCodeReply(); client.hkeys(key);
} return client.getStatusCodeReply();
}
public String hvals(final byte[] key) {
client.hvals(key); public String hvals(final byte[] key) {
return client.getStatusCodeReply(); client.hvals(key);
} return client.getStatusCodeReply();
}
public String hgetAll(final byte[] key) {
client.hgetAll(key); public String hgetAll(final byte[] key) {
return client.getStatusCodeReply(); client.hgetAll(key);
} return client.getStatusCodeReply();
}
public String rpush(final byte[] key, final byte[] string) {
client.rpush(key, string); public String rpush(final byte[] key, final byte[] string) {
return client.getStatusCodeReply(); client.rpush(key, string);
} return client.getStatusCodeReply();
}
public String lpush(final byte[] key, final byte[] string) {
client.lpush(key, string); public String lpush(final byte[] key, final byte[] string) {
return client.getStatusCodeReply(); client.lpush(key, string);
} return client.getStatusCodeReply();
}
public String llen(final byte[] key) {
client.llen(key); public String llen(final byte[] key) {
return client.getStatusCodeReply(); client.llen(key);
} return client.getStatusCodeReply();
}
public String lrange(final byte[] key, final int start, final int end) {
client.lrange(key, start, end); public String lrange(final byte[] key, final int start, final int end) {
return client.getStatusCodeReply(); client.lrange(key, start, end);
} return client.getStatusCodeReply();
}
public String ltrim(final byte[] key, final int start, final int end) {
client.ltrim(key, start, end); public String ltrim(final byte[] key, final int start, final int end) {
return client.getStatusCodeReply(); client.ltrim(key, start, end);
} return client.getStatusCodeReply();
}
public String lindex(final byte[] key, final int index) {
client.lindex(key, index); public String lindex(final byte[] key, final int index) {
return client.getStatusCodeReply(); client.lindex(key, index);
} return client.getStatusCodeReply();
}
public String lset(final byte[] key, final int index, final byte[] value) {
client.lset(key, index, value); public String lset(final byte[] key, final int index, final byte[] value) {
return client.getStatusCodeReply(); client.lset(key, index, value);
} return client.getStatusCodeReply();
}
public String lrem(final byte[] key, final int count, final byte[] value) {
client.lrem(key, count, value); public String lrem(final byte[] key, final int count, final byte[] value) {
return client.getStatusCodeReply(); client.lrem(key, count, value);
} return client.getStatusCodeReply();
}
public String lpop(final byte[] key) {
client.lpop(key); public String lpop(final byte[] key) {
return client.getStatusCodeReply(); client.lpop(key);
} return client.getStatusCodeReply();
}
public String rpop(final byte[] key) {
client.rpop(key); public String rpop(final byte[] key) {
return client.getStatusCodeReply(); client.rpop(key);
} return client.getStatusCodeReply();
}
public String rpoplpush(final byte[] srckey, final byte[] dstkey) {
client.rpoplpush(srckey, dstkey); public String rpoplpush(final byte[] srckey, final byte[] dstkey) {
return client.getStatusCodeReply(); client.rpoplpush(srckey, dstkey);
} return client.getStatusCodeReply();
}
public String sadd(final byte[] key, final byte[] member) {
client.sadd(key, member); public String sadd(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.sadd(key, member);
} return client.getStatusCodeReply();
}
public String smembers(final byte[] key) {
client.smembers(key); public String smembers(final byte[] key) {
return client.getStatusCodeReply(); client.smembers(key);
} return client.getStatusCodeReply();
}
public String srem(final byte[] key, final byte[] member) {
client.srem(key, member); public String srem(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.srem(key, member);
} return client.getStatusCodeReply();
}
public String spop(final byte[] key) {
client.spop(key); public String spop(final byte[] key) {
return client.getStatusCodeReply(); client.spop(key);
} return client.getStatusCodeReply();
}
public String smove(final byte[] srckey, final byte[] dstkey,
final byte[] member) { public String smove(final byte[] srckey, final byte[] dstkey,
client.smove(srckey, dstkey, member); final byte[] member) {
return client.getStatusCodeReply(); client.smove(srckey, dstkey, member);
} return client.getStatusCodeReply();
}
public String scard(final byte[] key) {
client.scard(key); public String scard(final byte[] key) {
return client.getStatusCodeReply(); client.scard(key);
} return client.getStatusCodeReply();
}
public String sismember(final byte[] key, final byte[] member) {
client.sismember(key, member); public String sismember(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.sismember(key, member);
} return client.getStatusCodeReply();
}
public String sinter(final byte[]... keys) {
client.sinter(keys); public String sinter(final byte[]... keys) {
return client.getStatusCodeReply(); client.sinter(keys);
} return client.getStatusCodeReply();
}
public String sinterstore(final byte[] dstkey, final byte[]... keys) {
client.sinterstore(dstkey, keys); public String sinterstore(final byte[] dstkey, final byte[]... keys) {
return client.getStatusCodeReply(); client.sinterstore(dstkey, keys);
} return client.getStatusCodeReply();
}
public String sunion(final byte[]... keys) {
client.sunion(keys); public String sunion(final byte[]... keys) {
return client.getStatusCodeReply(); client.sunion(keys);
} return client.getStatusCodeReply();
}
public String sunionstore(final byte[] dstkey, final byte[]... keys) {
client.sunionstore(dstkey, keys); public String sunionstore(final byte[] dstkey, final byte[]... keys) {
return client.getStatusCodeReply(); client.sunionstore(dstkey, keys);
} return client.getStatusCodeReply();
}
public String sdiff(final byte[]... keys) {
client.sdiff(keys); public String sdiff(final byte[]... keys) {
return client.getStatusCodeReply(); client.sdiff(keys);
} return client.getStatusCodeReply();
}
public String sdiffstore(final byte[] dstkey, final byte[]... keys) {
client.sdiffstore(dstkey, keys); public String sdiffstore(final byte[] dstkey, final byte[]... keys) {
return client.getStatusCodeReply(); client.sdiffstore(dstkey, keys);
} return client.getStatusCodeReply();
}
public String srandmember(final byte[] key) {
client.srandmember(key); public String srandmember(final byte[] key) {
return client.getStatusCodeReply(); client.srandmember(key);
} return client.getStatusCodeReply();
}
public String zadd(final byte[] key, final double score, final byte[] member) {
client.zadd(key, score, member); public String zadd(final byte[] key, final double score, final byte[] member) {
return client.getStatusCodeReply(); client.zadd(key, score, member);
} return client.getStatusCodeReply();
}
public String zrange(final byte[] key, final int start, final int end) {
client.zrange(key, start, end); public String zrange(final byte[] key, final int start, final int end) {
return client.getStatusCodeReply(); client.zrange(key, start, end);
} return client.getStatusCodeReply();
}
public String zrem(final byte[] key, final byte[] member) {
client.zrem(key, member); public String zrem(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.zrem(key, member);
} return client.getStatusCodeReply();
}
public String zincrby(final byte[] key, final double score,
final byte[] member) { public String zincrby(final byte[] key, final double score,
client.zincrby(key, score, member); final byte[] member) {
return client.getStatusCodeReply(); client.zincrby(key, score, member);
} return client.getStatusCodeReply();
}
public String zrank(final byte[] key, final byte[] member) {
client.zrank(key, member); public String zrank(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.zrank(key, member);
} return client.getStatusCodeReply();
}
public String zrevrank(final byte[] key, final byte[] member) {
client.zrevrank(key, member); public String zrevrank(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.zrevrank(key, member);
} return client.getStatusCodeReply();
}
public String zrevrange(final byte[] key, final int start, final int end) {
client.zrevrange(key, start, end); public String zrevrange(final byte[] key, final int start, final int end) {
return client.getStatusCodeReply(); client.zrevrange(key, start, end);
} return client.getStatusCodeReply();
}
public String zrangeWithScores(final byte[] key, final int start,
final int end) { public String zrangeWithScores(final byte[] key, final int start,
client.zrangeWithScores(key, start, end); final int end) {
return client.getStatusCodeReply(); client.zrangeWithScores(key, start, end);
} return client.getStatusCodeReply();
}
public String zrevrangeWithScores(final byte[] key, final int start,
final int end) { public String zrevrangeWithScores(final byte[] key, final int start,
client.zrevrangeWithScores(key, start, end); final int end) {
return client.getStatusCodeReply(); client.zrevrangeWithScores(key, start, end);
} return client.getStatusCodeReply();
}
public String zcard(final byte[] key) {
client.zcard(key); public String zcard(final byte[] key) {
return client.getStatusCodeReply(); client.zcard(key);
} return client.getStatusCodeReply();
}
public String zscore(final byte[] key, final byte[] member) {
client.zscore(key, member); public String zscore(final byte[] key, final byte[] member) {
return client.getStatusCodeReply(); client.zscore(key, member);
} return client.getStatusCodeReply();
}
public List<Object> exec() {
client.exec(); public List<Object> exec() {
client.exec();
return client.getObjectMultiBulkReply();
} return client.getObjectMultiBulkReply();
}
public String sort(final byte[] key) {
client.sort(key); public String sort(final byte[] key) {
return client.getStatusCodeReply(); client.sort(key);
} return client.getStatusCodeReply();
}
public String sort(final byte[] key, final SortingParams sortingParameters) {
client.sort(key, sortingParameters); public String sort(final byte[] key, final SortingParams sortingParameters) {
return client.getStatusCodeReply(); client.sort(key, sortingParameters);
} return client.getStatusCodeReply();
}
public void discard() {
client.discard(); public String discard() {
} client.discard();
inTransaction = false;
return client.getStatusCodeReply();
}
} }

View File

@@ -360,8 +360,12 @@ public class Client extends BinaryClient {
zscore(SafeEncoder.encode(key), SafeEncoder.encode(member)); zscore(SafeEncoder.encode(key), SafeEncoder.encode(member));
} }
public void watch(final String key) { public void watch(final String... keys) {
watch(SafeEncoder.encode(key)); final byte[][] bargs = new byte[keys.length][];
for (int i = 0; i < bargs.length; i++) {
bargs[i] = SafeEncoder.encode(keys[i]);
}
watch(bargs);
} }
public void sort(final String key) { public void sort(final String key) {

View File

@@ -1669,8 +1669,8 @@ public class Jedis extends BinaryJedis implements JedisCommands {
client.disconnect(); client.disconnect();
} }
public String watch(final String key) { public String watch(final String... keys) {
client.watch(key); client.watch(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }

View File

@@ -3,390 +3,390 @@ package redis.clients.jedis;
import java.util.Map; import java.util.Map;
public class Transaction extends BinaryTransaction { public class Transaction extends BinaryTransaction {
public Transaction() { public Transaction() {
} }
public Transaction(final Client client) { public Transaction(final Client client) {
super(client); super(client);
} }
public String set(final String key, final String value) { public String set(final String key, final String value) {
client.set(key, value); client.set(key, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String get(final String key) { public String get(final String key) {
client.get(key); client.get(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String exists(final String key) { public String exists(final String key) {
client.exists(key); client.exists(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String del(final String... keys) { public String del(final String... keys) {
client.del(keys); client.del(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String type(final String key) { public String type(final String key) {
client.type(key); client.type(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String keys(final String pattern) { public String keys(final String pattern) {
client.keys(pattern); client.keys(pattern);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String randomKey() { public String randomKey() {
client.randomKey(); client.randomKey();
return client.getBulkReply(); return client.getBulkReply();
} }
public String rename(final String oldkey, final String newkey) { public String rename(final String oldkey, final String newkey) {
client.rename(oldkey, newkey); client.rename(oldkey, newkey);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String renamenx(final String oldkey, final String newkey) { public String renamenx(final String oldkey, final String newkey) {
client.renamenx(oldkey, newkey); client.renamenx(oldkey, newkey);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String expire(final String key, final int seconds) { public String expire(final String key, final int seconds) {
client.expire(key, seconds); client.expire(key, seconds);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String expireAt(final String key, final long unixTime) { public String expireAt(final String key, final long unixTime) {
client.expireAt(key, unixTime); client.expireAt(key, unixTime);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String ttl(final String key) { public String ttl(final String key) {
client.ttl(key); client.ttl(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String move(final String key, final int dbIndex) { public String move(final String key, final int dbIndex) {
client.move(key, dbIndex); client.move(key, dbIndex);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String getSet(final String key, final String value) { public String getSet(final String key, final String value) {
client.getSet(key, value); client.getSet(key, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String mget(final String... keys) { public String mget(final String... keys) {
client.mget(keys); client.mget(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String setnx(final String key, final String value) { public String setnx(final String key, final String value) {
client.setnx(key, value); client.setnx(key, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String setex(final String key, final int seconds, final String value) { public String setex(final String key, final int seconds, final String value) {
client.setex(key, seconds, value); client.setex(key, seconds, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String mset(final String... keysvalues) { public String mset(final String... keysvalues) {
client.mset(keysvalues); client.mset(keysvalues);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String msetnx(final String... keysvalues) { public String msetnx(final String... keysvalues) {
client.msetnx(keysvalues); client.msetnx(keysvalues);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String decrBy(final String key, final int integer) { public String decrBy(final String key, final int integer) {
client.decrBy(key, integer); client.decrBy(key, integer);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String decr(final String key) { public String decr(final String key) {
client.decr(key); client.decr(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String incrBy(final String key, final int integer) { public String incrBy(final String key, final int integer) {
client.incrBy(key, integer); client.incrBy(key, integer);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String incr(final String key) { public String incr(final String key) {
client.incr(key); client.incr(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String append(final String key, final String value) { public String append(final String key, final String value) {
client.append(key, value); client.append(key, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String substr(final String key, final int start, final int end) { public String substr(final String key, final int start, final int end) {
client.substr(key, start, end); client.substr(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hset(final String key, final String field, final String value) { public String hset(final String key, final String field, final String value) {
client.hset(key, field, value); client.hset(key, field, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hget(final String key, final String field) { public String hget(final String key, final String field) {
client.hget(key, field); client.hget(key, field);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hsetnx(final String key, final String field, public String hsetnx(final String key, final String field,
final String value) { final String value) {
client.hsetnx(key, field, value); client.hsetnx(key, field, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hmset(final String key, final Map<String, String> hash) { public String hmset(final String key, final Map<String, String> hash) {
client.hmset(key, hash); client.hmset(key, hash);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hmget(final String key, final String... fields) { public String hmget(final String key, final String... fields) {
client.hmget(key, fields); client.hmget(key, fields);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hincrBy(final String key, final String field, final int value) { public String hincrBy(final String key, final String field, final int value) {
client.hincrBy(key, field, value); client.hincrBy(key, field, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hexists(final String key, final String field) { public String hexists(final String key, final String field) {
client.hexists(key, field); client.hexists(key, field);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hdel(final String key, final String field) { public String hdel(final String key, final String field) {
client.hdel(key, field); client.hdel(key, field);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hlen(final String key) { public String hlen(final String key) {
client.hlen(key); client.hlen(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hkeys(final String key) { public String hkeys(final String key) {
client.hkeys(key); client.hkeys(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hvals(final String key) { public String hvals(final String key) {
client.hvals(key); client.hvals(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String hgetAll(final String key) { public String hgetAll(final String key) {
client.hgetAll(key); client.hgetAll(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String rpush(final String key, final String string) { public String rpush(final String key, final String string) {
client.rpush(key, string); client.rpush(key, string);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lpush(final String key, final String string) { public String lpush(final String key, final String string) {
client.lpush(key, string); client.lpush(key, string);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String llen(final String key) { public String llen(final String key) {
client.llen(key); client.llen(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lrange(final String key, final int start, final int end) { public String lrange(final String key, final int start, final int end) {
client.lrange(key, start, end); client.lrange(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String ltrim(String key, final int start, final int end) { public String ltrim(String key, final int start, final int end) {
client.ltrim(key, start, end); client.ltrim(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lindex(final String key, final int index) { public String lindex(final String key, final int index) {
client.lindex(key, index); client.lindex(key, index);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lset(final String key, final int index, final String value) { public String lset(final String key, final int index, final String value) {
client.lset(key, index, value); client.lset(key, index, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lrem(final String key, final int count, final String value) { public String lrem(final String key, final int count, final String value) {
client.lrem(key, count, value); client.lrem(key, count, value);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String lpop(final String key) { public String lpop(final String key) {
client.lpop(key); client.lpop(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String rpop(final String key) { public String rpop(final String key) {
client.rpop(key); client.rpop(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String rpoplpush(final String srckey, final String dstkey) { public String rpoplpush(final String srckey, final String dstkey) {
client.rpoplpush(srckey, dstkey); client.rpoplpush(srckey, dstkey);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sadd(final String key, final String member) { public String sadd(final String key, final String member) {
client.sadd(key, member); client.sadd(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String smembers(final String key) { public String smembers(final String key) {
client.smembers(key); client.smembers(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String srem(final String key, final String member) { public String srem(final String key, final String member) {
client.srem(key, member); client.srem(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String spop(final String key) { public String spop(final String key) {
client.spop(key); client.spop(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String smove(final String srckey, final String dstkey, public String smove(final String srckey, final String dstkey,
final String member) { final String member) {
client.smove(srckey, dstkey, member); client.smove(srckey, dstkey, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String scard(final String key) { public String scard(final String key) {
client.scard(key); client.scard(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sismember(final String key, final String member) { public String sismember(final String key, final String member) {
client.sismember(key, member); client.sismember(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sinter(final String... keys) { public String sinter(final String... keys) {
client.sinter(keys); client.sinter(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sinterstore(final String dstkey, final String... keys) { public String sinterstore(final String dstkey, final String... keys) {
client.sinterstore(dstkey, keys); client.sinterstore(dstkey, keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sunion(final String... keys) { public String sunion(final String... keys) {
client.sunion(keys); client.sunion(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sunionstore(final String dstkey, final String... keys) { public String sunionstore(final String dstkey, final String... keys) {
client.sunionstore(dstkey, keys); client.sunionstore(dstkey, keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sdiff(final String... keys) { public String sdiff(final String... keys) {
client.sdiff(keys); client.sdiff(keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sdiffstore(final String dstkey, final String... keys) { public String sdiffstore(final String dstkey, final String... keys) {
client.sdiffstore(dstkey, keys); client.sdiffstore(dstkey, keys);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String srandmember(final String key) { public String srandmember(final String key) {
client.srandmember(key); client.srandmember(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zadd(final String key, final double score, final String member) { public String zadd(final String key, final double score, final String member) {
client.zadd(key, score, member); client.zadd(key, score, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrange(final String key, final int start, final int end) { public String zrange(final String key, final int start, final int end) {
client.zrange(key, start, end); client.zrange(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrem(final String key, final String member) { public String zrem(final String key, final String member) {
client.zrem(key, member); client.zrem(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zincrby(final String key, final double score, public String zincrby(final String key, final double score,
final String member) { final String member) {
client.zincrby(key, score, member); client.zincrby(key, score, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrank(final String key, final String member) { public String zrank(final String key, final String member) {
client.zrank(key, member); client.zrank(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrevrank(final String key, final String member) { public String zrevrank(final String key, final String member) {
client.zrevrank(key, member); client.zrevrank(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrevrange(final String key, final int start, final int end) { public String zrevrange(final String key, final int start, final int end) {
client.zrevrange(key, start, end); client.zrevrange(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrangeWithScores(final String key, final int start, public String zrangeWithScores(final String key, final int start,
final int end) { final int end) {
client.zrangeWithScores(key, start, end); client.zrangeWithScores(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zrevrangeWithScores(final String key, final int start, public String zrevrangeWithScores(final String key, final int start,
final int end) { final int end) {
client.zrevrangeWithScores(key, start, end); client.zrevrangeWithScores(key, start, end);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zcard(final String key) { public String zcard(final String key) {
client.zcard(key); client.zcard(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String zscore(final String key, final String member) { public String zscore(final String key, final String member) {
client.zscore(key, member); client.zscore(key, member);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sort(final String key) { public String sort(final String key) {
client.sort(key); client.sort(key);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public String sort(final String key, final SortingParams sortingParameters) { public String sort(final String key, final SortingParams sortingParameters) {
client.sort(key, sortingParameters); client.sort(key, sortingParameters);
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
} }

View File

@@ -124,7 +124,7 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
@Test @Test
public void watch() throws UnknownHostException, IOException { public void watch() throws UnknownHostException, IOException {
jedis.watch("mykey"); jedis.watch("mykey", "somekey");
Transaction t = jedis.multi(); Transaction t = jedis.multi();
nj.connect(); nj.connect();
@@ -197,4 +197,11 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
jedis.multi(); jedis.multi();
jedis.ping(); jedis.ping();
} }
@Test
public void discard() {
Transaction t = jedis.multi();
String status = t.discard();
assertEquals("OK", status);
}
} }