diff --git a/build.gradle b/build.gradle index 6f137f0a7..7ce199f4a 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,11 @@ buildscript { } } +repositories { + mavenRepo name: "springsource", urls: "http://repo.springsource.org/libs-snapshot" +} + + allprojects { group = 'org.springframework.data.redis' version = "$springDataRedisVersion" diff --git a/docs/src/reference/docbook/reference/redis.xml b/docs/src/reference/docbook/reference/redis.xml index 0b354e6d8..851323551 100644 --- a/docs/src/reference/docbook/reference/redis.xml +++ b/docs/src/reference/docbook/reference/redis.xml @@ -284,7 +284,7 @@ template; // inject the template as ListOperations diff --git a/gradle.properties b/gradle.properties index 700fbc276..7ca1a04e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ junitVersion = 4.8.1 mockitoVersion = 1.8.5 # Drivers -jedisVersion = 2.0.0 +jedisVersion = 2.1.0 jredisVersion = 03122010 rjcVersion = 0.6.4 srpVersion = 0.2 @@ -22,7 +22,7 @@ srpVersion = 0.2 ## OSGi ranges spring.range = "[3.1.0, 4.0.0)" -jedis.range = "[2.0.0, 2.0.0]" +jedis.range = "[2.1.0, 2.1.0]" jackson.range = "[1.6, 2.0.0)" rjc.range = "[0.6.4, 0.6.4]" srp.range = "[0.2, 1.0)" diff --git a/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java b/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java index f1d79c9bd..4ecebf0c1 100644 --- a/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java +++ b/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java @@ -26,7 +26,7 @@ import org.w3c.dom.Element; * * @author Costin Leau */ -public class RedisCollectionParser extends AbstractSimpleBeanDefinitionParser { +class RedisCollectionParser extends AbstractSimpleBeanDefinitionParser { protected Class getBeanClass(Element element) { diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java index 191b87cfc..42d2bf091 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java @@ -372,8 +372,8 @@ public class DefaultStringRedisConnection implements StringRedisConnection { return delegate.sDiff(keys); } - public void sDiffStore(byte[] destKey, byte[]... keys) { - delegate.sDiffStore(destKey, keys); + public Long sDiffStore(byte[] destKey, byte[]... keys) { + return delegate.sDiffStore(destKey, keys); } public void select(int dbIndex) { @@ -412,8 +412,8 @@ public class DefaultStringRedisConnection implements StringRedisConnection { return delegate.sInter(keys); } - public void sInterStore(byte[] destKey, byte[]... keys) { - delegate.sInterStore(destKey, keys); + public Long sInterStore(byte[] destKey, byte[]... keys) { + return delegate.sInterStore(destKey, keys); } public Boolean sIsMember(byte[] key, byte[] value) { @@ -460,8 +460,8 @@ public class DefaultStringRedisConnection implements StringRedisConnection { return delegate.sUnion(keys); } - public void sUnionStore(byte[] destKey, byte[]... keys) { - delegate.sUnionStore(destKey, keys); + public Long sUnionStore(byte[] destKey, byte[]... keys) { + return delegate.sUnionStore(destKey, keys); } public Long ttl(byte[] key) { @@ -1152,4 +1152,17 @@ public class DefaultStringRedisConnection implements StringRedisConnection { public void openPipeline() { delegate.openPipeline(); } + + + public Object execute(String command) { + return execute(command, (byte[][]) null); + } + + public Object execute(String command, byte[]... args) { + return delegate.execute(command, args); + } + + public Object execute(String command, String... args) { + return execute(command, serializeMulti(args)); + } } \ No newline at end of file diff --git a/src/main/java/org/springframework/data/redis/connection/RedisCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisCommands.java index 507d6faee..ff3ff20c7 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisCommands.java @@ -25,4 +25,16 @@ package org.springframework.data.redis.connection; public interface RedisCommands extends RedisKeyCommands, RedisStringCommands, RedisListCommands, RedisSetCommands, RedisZSetCommands, RedisHashCommands, RedisTxCommands, RedisPubSubCommands, RedisConnectionCommands, RedisServerCommands { + + + /** + * 'Native' or 'raw' execution of the given command along-side the given arguments. + * The command is executed as is, with as little 'interpretation' as possible - it is up to the caller + * to take care of any processing of arguments or the result. + * + * @param command Command to execute + * @param args Possible command arguments (may be null) + * @return execution result. + */ + Object execute(String command, byte[]... args); } \ No newline at end of file diff --git a/src/main/java/org/springframework/data/redis/connection/RedisSetCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisSetCommands.java index f3ec271ef..3c07ae99b 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisSetCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisSetCommands.java @@ -39,15 +39,15 @@ public interface RedisSetCommands { Set sInter(byte[]... keys); - void sInterStore(byte[] destKey, byte[]... keys); + Long sInterStore(byte[] destKey, byte[]... keys); Set sUnion(byte[]... keys); - void sUnionStore(byte[] destKey, byte[]... keys); + Long sUnionStore(byte[] destKey, byte[]... keys); Set sDiff(byte[]... keys); - void sDiffStore(byte[] destKey, byte[]... keys); + Long sDiffStore(byte[] destKey, byte[]... keys); Set sMembers(byte[] key); diff --git a/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java index a3edf9984..39794900d 100644 --- a/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java @@ -42,6 +42,10 @@ public interface StringRedisConnection extends RedisConnection { String getValueAsString(); } + Object execute(String command, String... args); + + Object execute(String command); + Boolean exists(String key); Long del(String... keys); diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java index 7899ab558..746f6178d 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java @@ -17,6 +17,7 @@ package org.springframework.data.redis.connection.jedis; import java.io.IOException; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -32,14 +33,20 @@ import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisSubscribedConnectionException; import org.springframework.data.redis.connection.SortParameters; import org.springframework.data.redis.connection.Subscription; +import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import redis.clients.jedis.BinaryJedis; import redis.clients.jedis.BinaryJedisPubSub; import redis.clients.jedis.BinaryTransaction; +import redis.clients.jedis.Builder; import redis.clients.jedis.Client; +import redis.clients.jedis.Connection; import redis.clients.jedis.Jedis; import redis.clients.jedis.Pipeline; +import redis.clients.jedis.Protocol.Command; +import redis.clients.jedis.Queable; import redis.clients.jedis.SortingParams; import redis.clients.jedis.Transaction; import redis.clients.jedis.ZParams; @@ -55,10 +62,17 @@ import redis.clients.util.Pool; public class JedisConnection implements RedisConnection { private static final Field CLIENT_FIELD; + private static final Method SEND_COMMAND; + private static final Method GET_RESPONSE; static { CLIENT_FIELD = ReflectionUtils.findField(BinaryJedis.class, "client", Client.class); ReflectionUtils.makeAccessible(CLIENT_FIELD); + SEND_COMMAND = ReflectionUtils.findMethod(Connection.class, "sendCommand", + new Class[] { Command.class, byte[][].class }); + ReflectionUtils.makeAccessible(SEND_COMMAND); + GET_RESPONSE = ReflectionUtils.findMethod(Queable.class, "getResponse", Builder.class); + ReflectionUtils.makeAccessible(GET_RESPONSE); } private final Jedis jedis; @@ -119,7 +133,31 @@ public class JedisConnection implements RedisConnection { return new RedisSystemException("Unknown jedis exception", ex); } - + public Object execute(String command, byte[]... args) { + Assert.hasText(command, "a valid command needs to be specified"); + List mArgs = new ArrayList(); + if (!ObjectUtils.isEmpty(args)) { + Collections.addAll(mArgs, args); + } + + Object result = ReflectionUtils.invokeMethod(SEND_COMMAND, client, + Command.valueOf(command.trim().toUpperCase()), mArgs.toArray(new byte[mArgs.size()][])); + if (isQueueing() || isPipelined()) { + Object target = (isPipelined() ? pipeline : transaction); + ReflectionUtils.invokeMethod(GET_RESPONSE, target, new Builder() { + public Object build(Object data) { + return data; + } + + public String toString() { + return "Object"; + } + }); + } + + return result; + } + public void close() throws DataAccessException { // return the connection to the pool try { @@ -158,12 +196,12 @@ public class JedisConnection implements RedisConnection { } } - + public Jedis getNativeConnection() { return jedis; } - + public boolean isClosed() { try { return !jedis.isConnected(); @@ -172,17 +210,17 @@ public class JedisConnection implements RedisConnection { } } - + public boolean isQueueing() { return client.isInMulti(); } - + public boolean isPipelined() { return (pipeline != null); } - + public void openPipeline() { if (pipeline == null) { pipeline = jedis.pipelined(); @@ -190,7 +228,6 @@ public class JedisConnection implements RedisConnection { } @SuppressWarnings("unchecked") - public List closePipeline() { if (pipeline != null) { List execute = pipeline.syncAndReturnAll(); @@ -201,7 +238,7 @@ public class JedisConnection implements RedisConnection { return Collections.emptyList(); } - + public List sort(byte[] key, SortParameters params) { SortingParams sortParams = JedisUtils.convertSortParams(params); @@ -233,7 +270,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long sort(byte[] key, SortParameters params, byte[] sortKey) { SortingParams sortParams = JedisUtils.convertSortParams(params); @@ -265,14 +302,14 @@ public class JedisConnection implements RedisConnection { } } - + public Long dbSize() { try { if (isQueueing()) { - throw new UnsupportedOperationException(); + transaction.dbSize(); } if (isPipelined()) { - throw new UnsupportedOperationException(); + pipeline.dbSize(); } return jedis.dbSize(); } catch (Exception ex) { @@ -281,14 +318,14 @@ public class JedisConnection implements RedisConnection { } - + public void flushDb() { try { if (isQueueing()) { - throw new UnsupportedOperationException(); + transaction.flushDB(); } if (isPipelined()) { - throw new UnsupportedOperationException(); + pipeline.flushDB(); } jedis.flushDB(); } catch (Exception ex) { @@ -296,14 +333,14 @@ public class JedisConnection implements RedisConnection { } } - + public void flushAll() { try { if (isQueueing()) { - throw new UnsupportedOperationException(); + transaction.flushAll(); } if (isPipelined()) { - throw new UnsupportedOperationException(); + pipeline.flushAll(); } jedis.flushAll(); } catch (Exception ex) { @@ -311,7 +348,7 @@ public class JedisConnection implements RedisConnection { } } - + public void bgSave() { try { if (isQueueing()) { @@ -327,7 +364,7 @@ public class JedisConnection implements RedisConnection { } } - + public void bgWriteAof() { try { if (isQueueing()) { @@ -343,7 +380,7 @@ public class JedisConnection implements RedisConnection { } } - + public void save() { try { if (isQueueing()) { @@ -359,7 +396,7 @@ public class JedisConnection implements RedisConnection { } } - + public List getConfig(String param) { try { if (isQueueing()) { @@ -375,7 +412,7 @@ public class JedisConnection implements RedisConnection { } } - + public Properties info() { try { if (isQueueing()) { @@ -390,7 +427,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long lastSave() { try { if (isQueueing()) { @@ -406,7 +443,7 @@ public class JedisConnection implements RedisConnection { } } - + public void setConfig(String param, String value) { try { if (isQueueing()) { @@ -423,7 +460,7 @@ public class JedisConnection implements RedisConnection { } - + public void resetConfigStats() { try { if (isQueueing()) { @@ -439,7 +476,7 @@ public class JedisConnection implements RedisConnection { } } - + public void shutdown() { try { if (isQueueing()) { @@ -454,7 +491,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] echo(byte[] message) { try { if (isQueueing()) { @@ -470,7 +507,7 @@ public class JedisConnection implements RedisConnection { } } - + public String ping() { try { if (isQueueing()) { @@ -485,7 +522,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long del(byte[]... keys) { try { if (isQueueing()) { @@ -502,7 +539,7 @@ public class JedisConnection implements RedisConnection { } } - + public void discard() { try { client.discard(); @@ -511,7 +548,7 @@ public class JedisConnection implements RedisConnection { } } - + public List exec() { try { if (isPipelined()) { @@ -524,7 +561,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean exists(byte[] key) { try { if (isQueueing()) { @@ -541,7 +578,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean expire(byte[] key, long seconds) { try { if (isQueueing()) { @@ -558,7 +595,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean expireAt(byte[] key, long unixTime) { try { if (isQueueing()) { @@ -575,7 +612,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set keys(byte[] pattern) { try { if (isQueueing()) { @@ -592,7 +629,7 @@ public class JedisConnection implements RedisConnection { } } - + public void multi() { if (isQueueing()) { return; @@ -608,7 +645,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean persist(byte[] key) { try { if (isQueueing()) { @@ -625,7 +662,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean move(byte[] key, int dbIndex) { try { if (isQueueing()) { @@ -642,7 +679,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] randomKey() { try { if (isQueueing()) { @@ -657,7 +694,7 @@ public class JedisConnection implements RedisConnection { } } - + public void rename(byte[] oldName, byte[] newName) { try { if (isQueueing()) { @@ -674,7 +711,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean renameNX(byte[] oldName, byte[] newName) { try { if (isQueueing()) { @@ -691,7 +728,7 @@ public class JedisConnection implements RedisConnection { } } - + public void select(int dbIndex) { try { if (isQueueing()) { @@ -706,7 +743,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long ttl(byte[] key) { try { if (isQueueing()) { @@ -723,7 +760,7 @@ public class JedisConnection implements RedisConnection { } } - + public DataType type(byte[] key) { try { if (isQueueing()) { @@ -740,7 +777,7 @@ public class JedisConnection implements RedisConnection { } } - + public void unwatch() { try { jedis.unwatch(); @@ -749,7 +786,7 @@ public class JedisConnection implements RedisConnection { } } - + public void watch(byte[]... keys) { if (isQueueing()) { throw new UnsupportedOperationException(); @@ -772,7 +809,7 @@ public class JedisConnection implements RedisConnection { // String commands // - + public byte[] get(byte[] key) { try { if (isQueueing()) { @@ -790,7 +827,7 @@ public class JedisConnection implements RedisConnection { } } - + public void set(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -808,7 +845,7 @@ public class JedisConnection implements RedisConnection { } - + public byte[] getSet(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -825,7 +862,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long append(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -842,7 +879,7 @@ public class JedisConnection implements RedisConnection { } } - + public List mGet(byte[]... keys) { try { if (isQueueing()) { @@ -859,7 +896,7 @@ public class JedisConnection implements RedisConnection { } } - + public void mSet(Map tuples) { try { if (isQueueing()) { @@ -876,7 +913,7 @@ public class JedisConnection implements RedisConnection { } } - + public void mSetNX(Map tuples) { try { if (isQueueing()) { @@ -893,7 +930,7 @@ public class JedisConnection implements RedisConnection { } } - + public void setEx(byte[] key, long time, byte[] value) { try { if (isQueueing()) { @@ -910,7 +947,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean setNX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -927,7 +964,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] getRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -944,7 +981,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long decr(byte[] key) { try { if (isQueueing()) { @@ -961,7 +998,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long decrBy(byte[] key, long value) { try { if (isQueueing()) { @@ -978,7 +1015,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long incr(byte[] key) { try { if (isQueueing()) { @@ -995,7 +1032,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long incrBy(byte[] key, long value) { try { if (isQueueing()) { @@ -1012,7 +1049,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean getBit(byte[] key, long offset) { try { if (isQueueing()) { @@ -1021,13 +1058,20 @@ public class JedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - return (jedis.getbit(key, offset) == 0 ? Boolean.FALSE : Boolean.TRUE); + // compatibility check for Jedis 2.0.0 + Object getBit = jedis.getbit(key, offset); + // Jedis 2.0 + if (getBit instanceof Long) { + return (((Long) getBit) == 0 ? Boolean.FALSE : Boolean.TRUE); + } + // Jedis 2.1 + return ((Boolean) getBit); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public void setBit(byte[] key, long offset, boolean value) { try { if (isQueueing()) { @@ -1042,7 +1086,7 @@ public class JedisConnection implements RedisConnection { } } - + public void setRange(byte[] key, byte[] value, long start) { try { if (isQueueing()) { @@ -1057,7 +1101,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long strLen(byte[] key) { try { if (isQueueing()) { @@ -1078,7 +1122,7 @@ public class JedisConnection implements RedisConnection { // List commands // - + public Long lPush(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1095,7 +1139,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long rPush(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1112,7 +1156,7 @@ public class JedisConnection implements RedisConnection { } } - + public List bLPop(int timeout, byte[]... keys) { try { if (isQueueing()) { @@ -1129,7 +1173,7 @@ public class JedisConnection implements RedisConnection { } } - + public List bRPop(int timeout, byte[]... keys) { try { if (isQueueing()) { @@ -1145,7 +1189,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] lIndex(byte[] key, long index) { try { if (isQueueing()) { @@ -1162,7 +1206,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { try { if (isQueueing()) { @@ -1179,7 +1223,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long lLen(byte[] key) { try { if (isQueueing()) { @@ -1196,7 +1240,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] lPop(byte[] key) { try { if (isQueueing()) { @@ -1213,7 +1257,7 @@ public class JedisConnection implements RedisConnection { } } - + public List lRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1230,7 +1274,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long lRem(byte[] key, long count, byte[] value) { try { if (isQueueing()) { @@ -1247,7 +1291,7 @@ public class JedisConnection implements RedisConnection { } } - + public void lSet(byte[] key, long index, byte[] value) { try { if (isQueueing()) { @@ -1264,7 +1308,7 @@ public class JedisConnection implements RedisConnection { } } - + public void lTrim(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1281,7 +1325,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] rPop(byte[] key) { try { if (isQueueing()) { @@ -1298,7 +1342,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { try { if (isQueueing()) { @@ -1315,7 +1359,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { try { if (isQueueing()) { @@ -1332,7 +1376,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long lPushX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1349,7 +1393,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long rPushX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1371,7 +1415,7 @@ public class JedisConnection implements RedisConnection { // Set commands // - + public Boolean sAdd(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1388,7 +1432,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long sCard(byte[] key) { try { if (isQueueing()) { @@ -1405,7 +1449,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set sDiff(byte[]... keys) { try { if (isQueueing()) { @@ -1422,24 +1466,24 @@ public class JedisConnection implements RedisConnection { } } - - public void sDiffStore(byte[] destKey, byte[]... keys) { + + public Long sDiffStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { transaction.sdiffstore(destKey, keys); - return; + return null; } if (isPipelined()) { pipeline.sdiffstore(destKey, keys); - return; + return null; } - jedis.sdiffstore(destKey, keys); + return jedis.sdiffstore(destKey, keys); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Set sInter(byte[]... keys) { try { if (isQueueing()) { @@ -1456,24 +1500,24 @@ public class JedisConnection implements RedisConnection { } } - - public void sInterStore(byte[] destKey, byte[]... keys) { + + public Long sInterStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { transaction.sinterstore(destKey, keys); - return; + return null; } if (isPipelined()) { pipeline.sinterstore(destKey, keys); - return; + return null; } - jedis.sinterstore(destKey, keys); + return jedis.sinterstore(destKey, keys); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Boolean sIsMember(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1490,7 +1534,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set sMembers(byte[] key) { try { if (isQueueing()) { @@ -1507,7 +1551,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { try { if (isQueueing()) { @@ -1524,7 +1568,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] sPop(byte[] key) { try { if (isQueueing()) { @@ -1541,7 +1585,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] sRandMember(byte[] key) { try { if (isQueueing()) { @@ -1558,7 +1602,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean sRem(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1575,7 +1619,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set sUnion(byte[]... keys) { try { if (isQueueing()) { @@ -1592,18 +1636,18 @@ public class JedisConnection implements RedisConnection { } } - - public void sUnionStore(byte[] destKey, byte[]... keys) { + + public Long sUnionStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { transaction.sunionstore(destKey, keys); - return; + return null; } if (isPipelined()) { pipeline.sunionstore(destKey, keys); - return; + return null; } - jedis.sunionstore(destKey, keys); + return jedis.sunionstore(destKey, keys); } catch (Exception ex) { throw convertJedisAccessException(ex); } @@ -1613,7 +1657,7 @@ public class JedisConnection implements RedisConnection { // ZSet commands // - + public Boolean zAdd(byte[] key, double score, byte[] value) { try { if (isQueueing()) { @@ -1630,7 +1674,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zCard(byte[] key) { try { if (isQueueing()) { @@ -1647,14 +1691,14 @@ public class JedisConnection implements RedisConnection { } } - + public Long zCount(byte[] key, double min, double max) { try { if (isQueueing()) { transaction.zcount(key, min, max); return null; } - if (isQueueing()) { + if (isPipelined()) { pipeline.zcount(key, min, max); return null; } @@ -1664,7 +1708,7 @@ public class JedisConnection implements RedisConnection { } } - + public Double zIncrBy(byte[] key, double increment, byte[] value) { try { if (isQueueing()) { @@ -1681,7 +1725,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { try { ZParams zparams = new ZParams().weights(weights).aggregate( @@ -1701,14 +1745,14 @@ public class JedisConnection implements RedisConnection { } } - + public Long zInterStore(byte[] destKey, byte[]... sets) { try { if (isQueueing()) { transaction.zinterstore(destKey, sets); return null; } - if (isQueueing()) { + if (isPipelined()) { pipeline.zinterstore(destKey, sets); return null; } @@ -1718,7 +1762,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1735,7 +1779,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRangeWithScores(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1752,7 +1796,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1769,7 +1813,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1786,7 +1830,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRevRangeWithScores(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1803,7 +1847,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1820,7 +1864,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1837,7 +1881,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1846,13 +1890,13 @@ public class JedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - throw new UnsupportedOperationException(); + return jedis.zrevrangeByScore(key, max, min, (int) offset, (int) count); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Set zRevRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1861,13 +1905,13 @@ public class JedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - throw new UnsupportedOperationException(); + return jedis.zrevrangeByScore(key, max, min); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1876,13 +1920,14 @@ public class JedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - throw new UnsupportedOperationException(); + return JedisUtils.convertJedisTuple(jedis.zrevrangeByScoreWithScores(key, max, min, (int) offset, + (int) count)); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1891,13 +1936,13 @@ public class JedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - throw new UnsupportedOperationException(); + return JedisUtils.convertJedisTuple(jedis.zrevrangeByScoreWithScores(key, max, min)); } catch (Exception ex) { throw convertJedisAccessException(ex); } } - + public Long zRank(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1914,7 +1959,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean zRem(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1931,7 +1976,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zRemRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1948,7 +1993,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zRemRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1965,7 +2010,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set zRevRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1982,7 +2027,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zRevRank(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1999,7 +2044,7 @@ public class JedisConnection implements RedisConnection { } } - + public Double zScore(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -2016,7 +2061,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { try { ZParams zparams = new ZParams().weights(weights).aggregate( @@ -2036,7 +2081,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long zUnionStore(byte[] destKey, byte[]... sets) { try { if (isQueueing()) { @@ -2057,7 +2102,7 @@ public class JedisConnection implements RedisConnection { // Hash commands // - + public Boolean hSet(byte[] key, byte[] field, byte[] value) { try { if (isQueueing()) { @@ -2074,7 +2119,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { try { if (isQueueing()) { @@ -2091,7 +2136,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean hDel(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2108,7 +2153,7 @@ public class JedisConnection implements RedisConnection { } } - + public Boolean hExists(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2125,7 +2170,7 @@ public class JedisConnection implements RedisConnection { } } - + public byte[] hGet(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2142,7 +2187,7 @@ public class JedisConnection implements RedisConnection { } } - + public Map hGetAll(byte[] key) { try { if (isQueueing()) { @@ -2159,7 +2204,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long hIncrBy(byte[] key, byte[] field, long delta) { try { if (isQueueing()) { @@ -2176,7 +2221,7 @@ public class JedisConnection implements RedisConnection { } } - + public Set hKeys(byte[] key) { try { if (isQueueing()) { @@ -2193,7 +2238,7 @@ public class JedisConnection implements RedisConnection { } } - + public Long hLen(byte[] key) { try { if (isQueueing()) { @@ -2210,7 +2255,7 @@ public class JedisConnection implements RedisConnection { } } - + public List hMGet(byte[] key, byte[]... fields) { try { if (isQueueing()) { @@ -2227,7 +2272,7 @@ public class JedisConnection implements RedisConnection { } } - + public void hMSet(byte[] key, Map tuple) { try { if (isQueueing()) { @@ -2244,7 +2289,7 @@ public class JedisConnection implements RedisConnection { } } - + public List hVals(byte[] key) { try { if (isQueueing()) { @@ -2265,7 +2310,7 @@ public class JedisConnection implements RedisConnection { // // Pub/Sub functionality // - + public Long publish(byte[] channel, byte[] message) { try { if (isQueueing()) { @@ -2281,17 +2326,17 @@ public class JedisConnection implements RedisConnection { } } - + public Subscription getSubscription() { return subscription; } - + public boolean isSubscribed() { return (subscription != null && subscription.isAlive()); } - + public void pSubscribe(MessageListener listener, byte[]... patterns) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( @@ -2316,7 +2361,7 @@ public class JedisConnection implements RedisConnection { } } - + public void subscribe(MessageListener listener, byte[]... channels) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java index 7a107cd7e..43878dcd6 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java @@ -58,8 +58,8 @@ public abstract class JedisUtils { private static final String OK_CODE = "OK"; private static final String OK_MULTI_CODE = "+OK"; - private static final byte[] ONE = new byte[] { 1 }; - private static final byte[] ZERO = new byte[] { 0 }; + private static final byte[] ONE = new byte[] { '1' }; + private static final byte[] ZERO = new byte[] { '0' }; /** * Converts the given, native Jedis exception to Spring's DAO hierarchy. diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java index e7d4a3a92..f0cdc25d1 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java @@ -15,6 +15,8 @@ */ package org.springframework.data.redis.connection.jredis; +import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; @@ -28,7 +30,9 @@ import org.jredis.JRedis; import org.jredis.Query.Support; import org.jredis.RedisException; import org.jredis.Sort; +import org.jredis.protocol.Command; import org.jredis.ri.alphazero.JRedisService; +import org.jredis.ri.alphazero.JRedisSupport; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.connection.DataType; @@ -37,6 +41,8 @@ import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.SortParameters; import org.springframework.data.redis.connection.Subscription; import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; +import org.springframework.util.ReflectionUtils; /** * {@code RedisConnection} implementation on top of JRedis library. @@ -45,10 +51,18 @@ import org.springframework.util.Assert; */ public class JredisConnection implements RedisConnection { + private static final Method SERVICE_REQUEST; + private final JRedis jredis; private final boolean isPool; private boolean isClosed = false; + static { + SERVICE_REQUEST = ReflectionUtils.findMethod(JRedisSupport.class, "serviceRequest", Command.class, + byte[][].class); + ReflectionUtils.makeAccessible(SERVICE_REQUEST); + } + /** * Constructs a new JredisConnection instance. * @@ -73,7 +87,18 @@ public class JredisConnection implements RedisConnection { return new RedisSystemException("Unknown JRedis exception", ex); } - + public Object execute(String command, byte[]... args) { + Assert.hasText(command, "a valid command needs to be specified"); + List mArgs = new ArrayList(); + if (!ObjectUtils.isEmpty(args)) { + Collections.addAll(mArgs, args); + } + + return ReflectionUtils.invokeMethod(SERVICE_REQUEST, jredis, Command.valueOf(command.trim().toUpperCase()), + mArgs.toArray(new byte[mArgs.size()][])); + + } + public void close() throws RedisSystemException { isClosed = true; @@ -88,37 +113,37 @@ public class JredisConnection implements RedisConnection { } } - + public JRedis getNativeConnection() { return jredis; } - + public boolean isClosed() { return isClosed; } - + public boolean isQueueing() { return false; } - + public boolean isPipelined() { return false; } - + public void openPipeline() { throw new UnsupportedOperationException("Pipelining not supported by JRedis"); } - + public List closePipeline() { return Collections.emptyList(); } - + public List sort(byte[] key, SortParameters params) { Sort sort = jredis.sort(JredisUtils.decode(key)); JredisUtils.applySortingParams(sort, params, null); @@ -129,7 +154,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long sort(byte[] key, SortParameters params, byte[] storeKey) { Sort sort = jredis.sort(JredisUtils.decode(key)); JredisUtils.applySortingParams(sort, params, null); @@ -140,7 +165,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long dbSize() { try { return jredis.dbsize(); @@ -149,7 +174,7 @@ public class JredisConnection implements RedisConnection { } } - + public void flushDb() { try { jredis.flushdb(); @@ -158,7 +183,7 @@ public class JredisConnection implements RedisConnection { } } - + public void flushAll() { try { jredis.flushall(); @@ -167,7 +192,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] echo(byte[] message) { try { return jredis.echo(message); @@ -176,7 +201,7 @@ public class JredisConnection implements RedisConnection { } } - + public String ping() { try { jredis.ping(); @@ -186,7 +211,7 @@ public class JredisConnection implements RedisConnection { } } - + public void bgSave() { try { jredis.bgsave(); @@ -195,7 +220,7 @@ public class JredisConnection implements RedisConnection { } } - + public void bgWriteAof() { try { jredis.bgrewriteaof(); @@ -204,7 +229,7 @@ public class JredisConnection implements RedisConnection { } } - + public void save() { try { jredis.save(); @@ -213,12 +238,12 @@ public class JredisConnection implements RedisConnection { } } - + public List getConfig(String pattern) { throw new UnsupportedOperationException(); } - + public Properties info() { try { return JredisUtils.info(jredis.info()); @@ -227,7 +252,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long lastSave() { try { return jredis.lastsave(); @@ -236,22 +261,22 @@ public class JredisConnection implements RedisConnection { } } - + public void setConfig(String param, String value) { throw new UnsupportedOperationException(); } - + public void resetConfigStats() { throw new UnsupportedOperationException(); } - + public void shutdown() { throw new UnsupportedOperationException(); } - + public Long del(byte[]... keys) { try { return jredis.del(JredisUtils.decodeMultiple(keys)); @@ -260,7 +285,7 @@ public class JredisConnection implements RedisConnection { } } - + public void discard() { try { jredis.discard(); @@ -269,12 +294,12 @@ public class JredisConnection implements RedisConnection { } } - + public List exec() { throw new UnsupportedOperationException(); } - + public Boolean exists(byte[] key) { try { return jredis.exists(JredisUtils.decode(key)); @@ -283,7 +308,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean expire(byte[] key, long seconds) { try { return jredis.expire(JredisUtils.decode(key), (int) seconds); @@ -292,7 +317,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean expireAt(byte[] key, long unixTime) { try { return jredis.expireat(JredisUtils.decode(key), unixTime); @@ -301,7 +326,7 @@ public class JredisConnection implements RedisConnection { } } - + public Set keys(byte[] pattern) { try { return JredisUtils.convertToSet(jredis.keys(JredisUtils.decode(pattern))); @@ -310,18 +335,18 @@ public class JredisConnection implements RedisConnection { } } - + public void multi() { throw new UnsupportedOperationException(); } - + public Boolean persist(byte[] key) { throw new UnsupportedOperationException(); } - + public Boolean move(byte[] key, int dbIndex) { try { return jredis.move(JredisUtils.decode(key), dbIndex); @@ -330,7 +355,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] randomKey() { try { return JredisUtils.encode(jredis.randomkey()); @@ -339,7 +364,7 @@ public class JredisConnection implements RedisConnection { } } - + public void rename(byte[] oldName, byte[] newName) { try { jredis.rename(JredisUtils.decode(oldName), JredisUtils.decode(newName)); @@ -348,7 +373,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean renameNX(byte[] oldName, byte[] newName) { try { return jredis.renamenx(JredisUtils.decode(oldName), JredisUtils.decode(newName)); @@ -357,12 +382,12 @@ public class JredisConnection implements RedisConnection { } } - + public void select(int dbIndex) { throw new UnsupportedOperationException(); } - + public Long ttl(byte[] key) { try { return jredis.ttl(JredisUtils.decode(key)); @@ -371,7 +396,7 @@ public class JredisConnection implements RedisConnection { } } - + public DataType type(byte[] key) { try { return JredisUtils.convertDataType(jredis.type(JredisUtils.decode(key))); @@ -380,12 +405,12 @@ public class JredisConnection implements RedisConnection { } } - + public void unwatch() { throw new UnsupportedOperationException(); } - + public void watch(byte[]... keys) { throw new UnsupportedOperationException(); } @@ -394,7 +419,7 @@ public class JredisConnection implements RedisConnection { // String operations // - + public byte[] get(byte[] key) { try { return jredis.get(JredisUtils.decode(key)); @@ -403,7 +428,7 @@ public class JredisConnection implements RedisConnection { } } - + public void set(byte[] key, byte[] value) { try { jredis.set(JredisUtils.decode(key), value); @@ -412,7 +437,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] getSet(byte[] key, byte[] value) { try { return jredis.getset(JredisUtils.decode(key), value); @@ -421,7 +446,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long append(byte[] key, byte[] value) { try { return jredis.append(JredisUtils.decode(key), value); @@ -430,7 +455,7 @@ public class JredisConnection implements RedisConnection { } } - + public List mGet(byte[]... keys) { try { return jredis.mget(JredisUtils.decodeMultiple(keys)); @@ -439,7 +464,7 @@ public class JredisConnection implements RedisConnection { } } - + public void mSet(Map tuple) { try { jredis.mset(JredisUtils.decodeMap(tuple)); @@ -448,7 +473,7 @@ public class JredisConnection implements RedisConnection { } } - + public void mSetNX(Map tuple) { try { jredis.msetnx(JredisUtils.decodeMap(tuple)); @@ -457,12 +482,12 @@ public class JredisConnection implements RedisConnection { } } - + public void setEx(byte[] key, long seconds, byte[] value) { throw new UnsupportedOperationException(); } - + public Boolean setNX(byte[] key, byte[] value) { try { return jredis.setnx(JredisUtils.decode(key), value); @@ -471,7 +496,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] getRange(byte[] key, long start, long end) { try { return jredis.substr(JredisUtils.decode(key), start, end); @@ -480,7 +505,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long decr(byte[] key) { try { return jredis.decr(JredisUtils.decode(key)); @@ -489,7 +514,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long decrBy(byte[] key, long value) { try { return jredis.decrby(JredisUtils.decode(key), (int) value); @@ -498,7 +523,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long incr(byte[] key) { try { return jredis.incr(JredisUtils.decode(key)); @@ -507,7 +532,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long incrBy(byte[] key, long value) { try { return jredis.incrby(JredisUtils.decode(key), (int) value); @@ -516,22 +541,22 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean getBit(byte[] key, long offset) { throw new UnsupportedOperationException(); } - + public void setBit(byte[] key, long offset, boolean value) { throw new UnsupportedOperationException(); } - + public void setRange(byte[] key, byte[] value, long start) { throw new UnsupportedOperationException(); } - + public Long strLen(byte[] key) { throw new UnsupportedOperationException(); } @@ -540,17 +565,17 @@ public class JredisConnection implements RedisConnection { // List commands // - + public List bLPop(int timeout, byte[]... keys) { throw new UnsupportedOperationException(); } - + public List bRPop(int timeout, byte[]... keys) { throw new UnsupportedOperationException(); } - + public byte[] lIndex(byte[] key, long index) { try { return jredis.lindex(JredisUtils.decode(key), index); @@ -559,7 +584,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long lLen(byte[] key) { try { return jredis.llen(JredisUtils.decode(key)); @@ -568,7 +593,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] lPop(byte[] key) { try { return jredis.lpop(JredisUtils.decode(key)); @@ -577,7 +602,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long lPush(byte[] key, byte[] value) { try { jredis.lpush(JredisUtils.decode(key), value); @@ -587,7 +612,7 @@ public class JredisConnection implements RedisConnection { } } - + public List lRange(byte[] key, long start, long end) { try { List lrange = jredis.lrange(JredisUtils.decode(key), start, end); @@ -598,7 +623,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long lRem(byte[] key, long count, byte[] value) { try { return jredis.lrem(JredisUtils.decode(key), value, (int) count); @@ -607,7 +632,7 @@ public class JredisConnection implements RedisConnection { } } - + public void lSet(byte[] key, long index, byte[] value) { try { jredis.lset(JredisUtils.decode(key), index, value); @@ -616,7 +641,7 @@ public class JredisConnection implements RedisConnection { } } - + public void lTrim(byte[] key, long start, long end) { try { jredis.ltrim(JredisUtils.decode(key), start, end); @@ -625,7 +650,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] rPop(byte[] key) { try { return jredis.rpop(JredisUtils.decode(key)); @@ -634,7 +659,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { try { return jredis.rpoplpush(JredisUtils.decode(srcKey), JredisUtils.decode(dstKey)); @@ -643,7 +668,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long rPush(byte[] key, byte[] value) { try { jredis.rpush(JredisUtils.decode(key), value); @@ -653,22 +678,22 @@ public class JredisConnection implements RedisConnection { } } - + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { throw new UnsupportedOperationException(); } - + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { throw new UnsupportedOperationException(); } - + public Long lPushX(byte[] key, byte[] value) { throw new UnsupportedOperationException(); } - + public Long rPushX(byte[] key, byte[] value) { throw new UnsupportedOperationException(); } @@ -678,7 +703,7 @@ public class JredisConnection implements RedisConnection { // Set commands // - + public Boolean sAdd(byte[] key, byte[] value) { try { return jredis.sadd(JredisUtils.decode(key), value); @@ -687,7 +712,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long sCard(byte[] key) { try { return jredis.scard(JredisUtils.decode(key)); @@ -696,7 +721,7 @@ public class JredisConnection implements RedisConnection { } } - + public Set sDiff(byte[]... keys) { String destKey = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -709,19 +734,20 @@ public class JredisConnection implements RedisConnection { } } - - public void sDiffStore(byte[] destKey, byte[]... keys) { + + public Long sDiffStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); try { jredis.sdiffstore(destSet, sets); + return Long.valueOf(-1); } catch (Exception ex) { throw convertJredisAccessException(ex); } } - + public Set sInter(byte[]... keys) { String set1 = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -734,19 +760,20 @@ public class JredisConnection implements RedisConnection { } } - - public void sInterStore(byte[] destKey, byte[]... keys) { + + public Long sInterStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); try { jredis.sinterstore(destSet, sets); + return Long.valueOf(-1); } catch (Exception ex) { throw convertJredisAccessException(ex); } } - + public Boolean sIsMember(byte[] key, byte[] value) { try { return jredis.sismember(JredisUtils.decode(key), value); @@ -755,7 +782,7 @@ public class JredisConnection implements RedisConnection { } } - + public Set sMembers(byte[] key) { try { return new LinkedHashSet(jredis.smembers(JredisUtils.decode(key))); @@ -764,7 +791,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { try { return jredis.smove(JredisUtils.decode(srcKey), JredisUtils.decode(destKey), value); @@ -773,7 +800,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] sPop(byte[] key) { try { return jredis.spop(JredisUtils.decode(key)); @@ -782,7 +809,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] sRandMember(byte[] key) { try { return jredis.srandmember(JredisUtils.decode(key)); @@ -791,7 +818,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean sRem(byte[] key, byte[] value) { try { return jredis.srem(JredisUtils.decode(key), value); @@ -800,7 +827,7 @@ public class JredisConnection implements RedisConnection { } } - + public Set sUnion(byte[]... keys) { String set1 = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -812,13 +839,14 @@ public class JredisConnection implements RedisConnection { } } - - public void sUnionStore(byte[] destKey, byte[]... keys) { + + public Long sUnionStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); try { jredis.sunionstore(destSet, sets); + return Long.valueOf(-1); } catch (Exception ex) { throw convertJredisAccessException(ex); } @@ -829,7 +857,7 @@ public class JredisConnection implements RedisConnection { // ZSet commands // - + public Boolean zAdd(byte[] key, double score, byte[] value) { try { return jredis.zadd(JredisUtils.decode(key), score, value); @@ -838,7 +866,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long zCard(byte[] key) { try { return jredis.zcard(JredisUtils.decode(key)); @@ -847,7 +875,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long zCount(byte[] key, double min, double max) { try { return jredis.zcount(JredisUtils.decode(key), min, max); @@ -856,7 +884,7 @@ public class JredisConnection implements RedisConnection { } } - + public Double zIncrBy(byte[] key, double increment, byte[] value) { try { return jredis.zincrby(JredisUtils.decode(key), increment, value); @@ -865,17 +893,17 @@ public class JredisConnection implements RedisConnection { } } - + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { throw new UnsupportedOperationException(); } - + public Long zInterStore(byte[] destKey, byte[]... sets) { throw new UnsupportedOperationException(); } - + public Set zRange(byte[] key, long start, long end) { try { return new LinkedHashSet(jredis.zrange(JredisUtils.decode(key), start, end)); @@ -884,12 +912,12 @@ public class JredisConnection implements RedisConnection { } } - + public Set zRangeWithScores(byte[] key, long start, long end) { throw new UnsupportedOperationException(); } - + public Set zRangeByScore(byte[] key, double min, double max) { try { return new LinkedHashSet(jredis.zrangebyscore(JredisUtils.decode(key), min, max)); @@ -898,42 +926,42 @@ public class JredisConnection implements RedisConnection { } } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - + public Set zRevRangeByScore(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - + public Long zRank(byte[] key, byte[] value) { try { return jredis.zrank(JredisUtils.decode(key), value); @@ -942,7 +970,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean zRem(byte[] key, byte[] value) { try { return jredis.zrem(JredisUtils.decode(key), value); @@ -951,7 +979,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long zRemRange(byte[] key, long start, long end) { try { return jredis.zremrangebyrank(JredisUtils.decode(key), start, end); @@ -960,7 +988,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long zRemRangeByScore(byte[] key, double min, double max) { try { return jredis.zremrangebyscore(JredisUtils.decode(key), min, max); @@ -969,7 +997,7 @@ public class JredisConnection implements RedisConnection { } } - + public Set zRevRange(byte[] key, long start, long end) { try { return new LinkedHashSet(jredis.zrevrange(JredisUtils.decode(key), start, end)); @@ -978,12 +1006,12 @@ public class JredisConnection implements RedisConnection { } } - + public Set zRevRangeWithScores(byte[] key, long start, long end) { throw new UnsupportedOperationException(); } - + public Long zRevRank(byte[] key, byte[] value) { try { return jredis.zrevrank(JredisUtils.decode(key), value); @@ -992,7 +1020,7 @@ public class JredisConnection implements RedisConnection { } } - + public Double zScore(byte[] key, byte[] value) { try { return jredis.zscore(JredisUtils.decode(key), value); @@ -1006,17 +1034,17 @@ public class JredisConnection implements RedisConnection { // Hash commands // - + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { throw new UnsupportedOperationException(); } - + public Long zUnionStore(byte[] destKey, byte[]... sets) { throw new UnsupportedOperationException(); } - + public Boolean hDel(byte[] key, byte[] field) { try { return jredis.hdel(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1025,7 +1053,7 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean hExists(byte[] key, byte[] field) { try { return jredis.hexists(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1034,7 +1062,7 @@ public class JredisConnection implements RedisConnection { } } - + public byte[] hGet(byte[] key, byte[] field) { try { return jredis.hget(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1043,7 +1071,7 @@ public class JredisConnection implements RedisConnection { } } - + public Map hGetAll(byte[] key) { try { return JredisUtils.encodeMap(jredis.hgetall(JredisUtils.decode(key))); @@ -1052,12 +1080,12 @@ public class JredisConnection implements RedisConnection { } } - + public Long hIncrBy(byte[] key, byte[] field, long delta) { throw new UnsupportedOperationException(); } - + public Set hKeys(byte[] key) { try { return new LinkedHashSet(JredisUtils.convertToSet(jredis.hkeys(JredisUtils.decode(key)))); @@ -1066,7 +1094,7 @@ public class JredisConnection implements RedisConnection { } } - + public Long hLen(byte[] key) { try { return jredis.hlen(JredisUtils.decode(key)); @@ -1075,17 +1103,17 @@ public class JredisConnection implements RedisConnection { } } - + public List hMGet(byte[] key, byte[]... fields) { throw new UnsupportedOperationException(); } - + public void hMSet(byte[] key, Map values) { throw new UnsupportedOperationException(); } - + public Boolean hSet(byte[] key, byte[] field, byte[] value) { try { return jredis.hset(JredisUtils.decode(key), JredisUtils.decode(field), value); @@ -1094,12 +1122,12 @@ public class JredisConnection implements RedisConnection { } } - + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { throw new UnsupportedOperationException(); } - + public List hVals(byte[] key) { try { return jredis.hvals(JredisUtils.decode(key)); @@ -1112,27 +1140,27 @@ public class JredisConnection implements RedisConnection { // PubSub commands // - + public Subscription getSubscription() { return null; } - + public boolean isSubscribed() { return false; } - + public void pSubscribe(MessageListener listener, byte[]... patterns) { throw new UnsupportedOperationException(); } - + public Long publish(byte[] channel, byte[] message) { throw new UnsupportedOperationException(); } - + public void subscribe(MessageListener listener, byte[]... channels) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java index 19c7a6fc6..621dc9591 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java @@ -28,6 +28,7 @@ import org.idevlab.rjc.SessionFactoryImpl; import org.idevlab.rjc.SortingParams; import org.idevlab.rjc.ZParams; import org.idevlab.rjc.message.RedisNodeSubscriber; +import org.idevlab.rjc.protocol.Protocol.Command; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.connection.DataType; @@ -36,6 +37,8 @@ import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisSubscribedConnectionException; import org.springframework.data.redis.connection.SortParameters; import org.springframework.data.redis.connection.Subscription; +import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; /** * {@code RedisConnection} implementation on top of rjc library. @@ -49,6 +52,7 @@ public class RjcConnection implements RedisConnection { private final Client client; private final Session session; + private final org.idevlab.rjc.ds.RedisConnection connection; private volatile Client pipeline; private volatile RjcSubscription subscription; @@ -60,6 +64,7 @@ public class RjcConnection implements RedisConnection { subscriber = new RedisNodeSubscriber(); subscriber.setDataSource(new SingleDataSource(new CloseSuppressingRjcConnection(connection))); client = new Client(connection); + this.connection = connection; this.dbIndex = dbIndex; @@ -76,7 +81,13 @@ public class RjcConnection implements RedisConnection { return new RedisSystemException("Unknown rjc exception", ex); } - + public Object execute(String command, byte[]... args) { + Assert.hasText(command, "a valid command needs to be specified"); + connection.sendCommand(Command.valueOf(command.trim().toUpperCase()), + (ObjectUtils.isEmpty(args) ? new byte[0][] : args)); + return connection.getAll(); + } + public void close() throws DataAccessException { isClosed = true; @@ -94,27 +105,27 @@ public class RjcConnection implements RedisConnection { } - + public boolean isClosed() { return isClosed; } - + public Session getNativeConnection() { return session; } - + public boolean isQueueing() { return client.isInMulti(); } - + public boolean isPipelined() { return (pipeline != null); } - + public void openPipeline() { if (pipeline == null) { pipeline = client; @@ -122,7 +133,6 @@ public class RjcConnection implements RedisConnection { } @SuppressWarnings("unchecked") - public List closePipeline() { if (pipeline != null) { List execute = client.getAll(); @@ -133,7 +143,7 @@ public class RjcConnection implements RedisConnection { return Collections.emptyList(); } - + public List sort(byte[] key, SortParameters params) { SortingParams sortParams = RjcUtils.convertSortParams(params); @@ -157,7 +167,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long sort(byte[] key, SortParameters params, byte[] sortKey) { SortingParams sortParams = RjcUtils.convertSortParams(params); @@ -182,7 +192,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long dbSize() { try { if (isPipelined()) { @@ -196,7 +206,7 @@ public class RjcConnection implements RedisConnection { } - + public void flushDb() { try { if (isPipelined()) { @@ -209,7 +219,7 @@ public class RjcConnection implements RedisConnection { } } - + public void flushAll() { try { if (isPipelined()) { @@ -222,7 +232,7 @@ public class RjcConnection implements RedisConnection { } } - + public void bgSave() { try { if (isPipelined()) { @@ -235,7 +245,7 @@ public class RjcConnection implements RedisConnection { } } - + public void bgWriteAof() { try { if (isPipelined()) { @@ -248,7 +258,7 @@ public class RjcConnection implements RedisConnection { } } - + public void save() { try { if (isPipelined()) { @@ -261,7 +271,7 @@ public class RjcConnection implements RedisConnection { } } - + public List getConfig(String param) { try { if (isPipelined()) { @@ -274,7 +284,7 @@ public class RjcConnection implements RedisConnection { } } - + public Properties info() { try { if (isPipelined()) { @@ -287,7 +297,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long lastSave() { try { if (isPipelined()) { @@ -300,7 +310,7 @@ public class RjcConnection implements RedisConnection { } } - + public void setConfig(String param, String value) { try { if (isPipelined()) { @@ -314,7 +324,7 @@ public class RjcConnection implements RedisConnection { } - + public void resetConfigStats() { try { if (isPipelined()) { @@ -328,7 +338,7 @@ public class RjcConnection implements RedisConnection { } } - + public void shutdown() { try { if (isPipelined()) { @@ -341,7 +351,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] echo(byte[] message) { String stringMsg = RjcUtils.decode(message); try { @@ -355,7 +365,7 @@ public class RjcConnection implements RedisConnection { } } - + public String ping() { try { if (isPipelined()) { @@ -367,7 +377,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long del(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -382,7 +392,7 @@ public class RjcConnection implements RedisConnection { } } - + public void discard() { try { if (isPipelined()) { @@ -396,7 +406,7 @@ public class RjcConnection implements RedisConnection { } } - + public List exec() { try { if (isPipelined()) { @@ -409,7 +419,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean exists(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -424,7 +434,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean expire(byte[] key, long seconds) { String stringKey = RjcUtils.decode(key); @@ -439,7 +449,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean expireAt(byte[] key, long unixTime) { String stringKey = RjcUtils.decode(key); @@ -454,7 +464,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set keys(byte[] pattern) { String stringKey = RjcUtils.decode(pattern); @@ -469,7 +479,7 @@ public class RjcConnection implements RedisConnection { } } - + public void multi() { if (isQueueing()) { return; @@ -485,7 +495,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean persist(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -500,7 +510,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean move(byte[] key, int dbIndex) { String stringKey = RjcUtils.decode(key); @@ -515,7 +525,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] randomKey() { try { if (isPipelined()) { @@ -528,7 +538,7 @@ public class RjcConnection implements RedisConnection { } } - + public void rename(byte[] oldName, byte[] newName) { String stringOldKey = RjcUtils.decode(oldName); String stringNewKey = RjcUtils.decode(newName); @@ -544,7 +554,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean renameNX(byte[] oldName, byte[] newName) { String stringOldKey = RjcUtils.decode(oldName); String stringNewKey = RjcUtils.decode(newName); @@ -560,7 +570,7 @@ public class RjcConnection implements RedisConnection { } } - + public void select(int dbIndex) { try { if (isPipelined()) { @@ -573,7 +583,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long ttl(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -588,7 +598,7 @@ public class RjcConnection implements RedisConnection { } } - + public DataType type(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -603,7 +613,7 @@ public class RjcConnection implements RedisConnection { } } - + public void unwatch() { try { if (isPipelined()) { @@ -617,7 +627,7 @@ public class RjcConnection implements RedisConnection { } } - + public void watch(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -641,7 +651,7 @@ public class RjcConnection implements RedisConnection { // String commands // - + public byte[] get(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -657,7 +667,7 @@ public class RjcConnection implements RedisConnection { } } - + public void set(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -674,7 +684,7 @@ public class RjcConnection implements RedisConnection { } - + public byte[] getSet(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -690,7 +700,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long append(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -706,7 +716,7 @@ public class RjcConnection implements RedisConnection { } } - + public List mGet(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -721,7 +731,7 @@ public class RjcConnection implements RedisConnection { } } - + public void mSet(Map tuples) { String[] decodeMap = RjcUtils.flatten(tuples); @@ -736,7 +746,7 @@ public class RjcConnection implements RedisConnection { } } - + public void mSetNX(Map tuples) { String[] decodeMap = RjcUtils.flatten(tuples); @@ -752,7 +762,7 @@ public class RjcConnection implements RedisConnection { } } - + public void setEx(byte[] key, long time, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -768,7 +778,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean setNX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -784,7 +794,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] getRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -799,7 +809,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long decr(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -814,7 +824,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long decrBy(byte[] key, long value) { String stringKey = RjcUtils.decode(key); try { @@ -829,7 +839,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long incr(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -845,7 +855,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long incrBy(byte[] key, long value) { String stringKey = RjcUtils.decode(key); @@ -861,7 +871,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean getBit(byte[] key, long offset) { String stringKey = RjcUtils.decode(key); @@ -876,7 +886,7 @@ public class RjcConnection implements RedisConnection { } } - + public void setBit(byte[] key, long offset, boolean value) { String stringKey = RjcUtils.decode(key); @@ -891,7 +901,7 @@ public class RjcConnection implements RedisConnection { } } - + public void setRange(byte[] key, byte[] value, long offset) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -907,7 +917,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long strLen(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -926,7 +936,7 @@ public class RjcConnection implements RedisConnection { // List commands // - + public Long lPush(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -942,7 +952,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long rPush(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -959,7 +969,7 @@ public class RjcConnection implements RedisConnection { } } - + public List bLPop(int timeout, byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -974,7 +984,7 @@ public class RjcConnection implements RedisConnection { } } - + public List bRPop(int timeout, byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -989,7 +999,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] lIndex(byte[] key, long index) { String stringKey = RjcUtils.decode(key); @@ -1005,7 +1015,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1023,7 +1033,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long lLen(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1039,7 +1049,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] lPop(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1055,7 +1065,7 @@ public class RjcConnection implements RedisConnection { } } - + public List lRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -1071,7 +1081,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long lRem(byte[] key, long count, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1088,7 +1098,7 @@ public class RjcConnection implements RedisConnection { } } - + public void lSet(byte[] key, long index, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1104,7 +1114,7 @@ public class RjcConnection implements RedisConnection { } } - + public void lTrim(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -1120,7 +1130,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] rPop(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1136,7 +1146,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { String stringKey = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(dstKey); @@ -1153,7 +1163,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { String stringKey = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(dstKey); @@ -1169,7 +1179,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long lPushX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1184,7 +1194,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long rPushX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1204,7 +1214,7 @@ public class RjcConnection implements RedisConnection { // Set commands // - + public Boolean sAdd(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1221,7 +1231,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long sCard(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1237,7 +1247,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set sDiff(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1253,8 +1263,8 @@ public class RjcConnection implements RedisConnection { } } - - public void sDiffStore(byte[] destKey, byte[]... keys) { + + public Long sDiffStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1262,15 +1272,15 @@ public class RjcConnection implements RedisConnection { if (isPipelined()) { pipeline.sdiffstore(stringKey, stringKeys); - return; + return null; } - session.sdiffstore(stringKey, stringKeys); + return session.sdiffstore(stringKey, stringKeys); } catch (Exception ex) { throw convertRjcAccessException(ex); } } - + public Set sInter(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); try { @@ -1285,23 +1295,23 @@ public class RjcConnection implements RedisConnection { } } - - public void sInterStore(byte[] destKey, byte[]... keys) { + + public Long sInterStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); try { if (isPipelined()) { pipeline.sinterstore(stringKey, stringKeys); - return; + return null; } - session.sinterstore(stringKey, stringKeys); + return session.sinterstore(stringKey, stringKeys); } catch (Exception ex) { throw convertRjcAccessException(ex); } } - + public Boolean sIsMember(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1318,7 +1328,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set sMembers(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1333,7 +1343,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { String stringSrc = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(destKey); @@ -1351,7 +1361,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] sPop(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1366,7 +1376,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] sRandMember(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1381,7 +1391,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean sRem(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1398,7 +1408,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set sUnion(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1414,8 +1424,8 @@ public class RjcConnection implements RedisConnection { } } - - public void sUnionStore(byte[] destKey, byte[]... keys) { + + public Long sUnionStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1423,9 +1433,9 @@ public class RjcConnection implements RedisConnection { if (isPipelined()) { pipeline.sunionstore(stringKey, stringKeys); - return; + return null; } - session.sunionstore(stringKey, stringKeys); + return session.sunionstore(stringKey, stringKeys); } catch (Exception ex) { throw convertRjcAccessException(ex); } @@ -1435,7 +1445,7 @@ public class RjcConnection implements RedisConnection { // ZSet commands // - + public Boolean zAdd(byte[] key, double score, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1451,7 +1461,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zCard(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1466,7 +1476,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zCount(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); try { @@ -1481,7 +1491,7 @@ public class RjcConnection implements RedisConnection { } } - + public Double zIncrBy(byte[] key, double increment, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1497,7 +1507,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1515,7 +1525,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zInterStore(byte[] destKey, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1531,7 +1541,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1546,7 +1556,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRangeWithScores(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1561,7 +1571,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1578,7 +1588,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1597,7 +1607,7 @@ public class RjcConnection implements RedisConnection { } - + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1615,7 +1625,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRevRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1632,7 +1642,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1649,7 +1659,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRevRangeWithScores(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); String minString = Long.toString(start); @@ -1667,7 +1677,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1686,7 +1696,7 @@ public class RjcConnection implements RedisConnection { } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1705,7 +1715,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1723,7 +1733,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zRank(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1739,7 +1749,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean zRem(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1755,7 +1765,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zRemRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1769,7 +1779,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zRemRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1786,7 +1796,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set zRevRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1801,7 +1811,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zRevRank(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1817,7 +1827,7 @@ public class RjcConnection implements RedisConnection { } } - + public Double zScore(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1833,7 +1843,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(destKey); @@ -1851,7 +1861,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long zUnionStore(byte[] destKey, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1871,7 +1881,7 @@ public class RjcConnection implements RedisConnection { // Hash commands // - + public Boolean hSet(byte[] key, byte[] field, byte[] value) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1888,7 +1898,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1905,7 +1915,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean hDel(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1921,7 +1931,7 @@ public class RjcConnection implements RedisConnection { } } - + public Boolean hExists(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1937,7 +1947,7 @@ public class RjcConnection implements RedisConnection { } } - + public byte[] hGet(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1953,7 +1963,7 @@ public class RjcConnection implements RedisConnection { } } - + public Map hGetAll(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1968,7 +1978,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long hIncrBy(byte[] key, byte[] field, long delta) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1984,7 +1994,7 @@ public class RjcConnection implements RedisConnection { } } - + public Set hKeys(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1998,7 +2008,7 @@ public class RjcConnection implements RedisConnection { } } - + public Long hLen(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -2012,7 +2022,7 @@ public class RjcConnection implements RedisConnection { } } - + public List hMGet(byte[] key, byte[]... fields) { String stringKey = RjcUtils.decode(key); String[] stringKeys = RjcUtils.decodeMultiple(fields); @@ -2028,7 +2038,7 @@ public class RjcConnection implements RedisConnection { } } - + public void hMSet(byte[] key, Map tuple) { String stringKey = RjcUtils.decode(key); Map stringTuple = RjcUtils.decodeMap(tuple); @@ -2044,7 +2054,7 @@ public class RjcConnection implements RedisConnection { } } - + public List hVals(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -2063,7 +2073,7 @@ public class RjcConnection implements RedisConnection { // // Pub/Sub functionality // - + public Long publish(byte[] channel, byte[] message) { try { if (isQueueing()) { @@ -2078,17 +2088,17 @@ public class RjcConnection implements RedisConnection { } } - + public Subscription getSubscription() { return subscription; } - + public boolean isSubscribed() { return (subscription != null && subscription.isAlive()); } - + public void pSubscribe(MessageListener listener, byte[]... patterns) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( @@ -2112,7 +2122,7 @@ public class RjcConnection implements RedisConnection { } } - + public void subscribe(MessageListener listener, byte[]... channels) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( diff --git a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java index 85013edc3..fe137dae0 100644 --- a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java +++ b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java @@ -53,23 +53,32 @@ abstract class AbstractOperations { protected abstract byte[] inRedis(byte[] rawKey, RedisConnection connection); } - RedisSerializer keySerializer = null; - RedisSerializer valueSerializer = null; - RedisSerializer hashKeySerializer = null; - RedisSerializer hashValueSerializer = null; - RedisSerializer stringSerializer = null; RedisTemplate template; AbstractOperations(RedisTemplate template) { - keySerializer = template.getKeySerializer(); - valueSerializer = template.getValueSerializer(); - hashKeySerializer = template.getHashKeySerializer(); - hashValueSerializer = template.getHashValueSerializer(); - stringSerializer = template.getStringSerializer(); - this.template = template; } + RedisSerializer keySerializer() { + return template.getKeySerializer(); + } + + RedisSerializer valueSerializer() { + return template.getValueSerializer(); + } + + RedisSerializer hashKeySerializer() { + return template.getHashKeySerializer(); + } + + RedisSerializer hashValueSerializer() { + return template.getHashValueSerializer(); + } + + RedisSerializer stringSerializer() { + return template.getStringSerializer(); + } + T execute(RedisCallback callback, boolean b) { return template.execute(callback, b); @@ -82,27 +91,27 @@ abstract class AbstractOperations { @SuppressWarnings("unchecked") byte[] rawKey(Object key) { Assert.notNull(key, "non null key required"); - return keySerializer.serialize(key); + return keySerializer().serialize(key); } byte[] rawString(String key) { - return stringSerializer.serialize(key); + return stringSerializer().serialize(key); } @SuppressWarnings("unchecked") byte[] rawValue(Object value) { - return valueSerializer.serialize(value); + return valueSerializer().serialize(value); } @SuppressWarnings("unchecked") byte[] rawHashKey(HK hashKey) { Assert.notNull(hashKey, "non null hash key required"); - return hashKeySerializer.serialize(hashKey); + return hashKeySerializer().serialize(hashKey); } @SuppressWarnings("unchecked") byte[] rawHashValue(HV value) { - return hashValueSerializer.serialize(value); + return hashValueSerializer().serialize(value); } byte[][] rawKeys(K key, K otherKey) { @@ -136,31 +145,31 @@ abstract class AbstractOperations { @SuppressWarnings("unchecked") Set deserializeValues(Set rawValues) { - return SerializationUtils.deserialize(rawValues, valueSerializer); + return SerializationUtils.deserialize(rawValues, valueSerializer()); } @SuppressWarnings("unchecked") Set> deserializeTupleValues(Set rawValues) { Set> set = new LinkedHashSet>(rawValues.size()); for (Tuple rawValue : rawValues) { - set.add(new DefaultTypedTuple(valueSerializer.deserialize(rawValue.getValue()), rawValue.getScore())); + set.add(new DefaultTypedTuple(valueSerializer().deserialize(rawValue.getValue()), rawValue.getScore())); } return set; } @SuppressWarnings("unchecked") List deserializeValues(List rawValues) { - return SerializationUtils.deserialize(rawValues, valueSerializer); + return SerializationUtils.deserialize(rawValues, valueSerializer()); } @SuppressWarnings("unchecked") Set deserializeHashKeys(Set rawKeys) { - return SerializationUtils.deserialize(rawKeys, hashKeySerializer); + return SerializationUtils.deserialize(rawKeys, hashKeySerializer()); } @SuppressWarnings("unchecked") List deserializeHashValues(List rawValues) { - return SerializationUtils.deserialize(rawValues, hashValueSerializer); + return SerializationUtils.deserialize(rawValues, hashValueSerializer()); } @SuppressWarnings("unchecked") @@ -181,25 +190,25 @@ abstract class AbstractOperations { @SuppressWarnings("unchecked") K deserializeKey(byte[] value) { - return (K) keySerializer.deserialize(value); + return (K) keySerializer().deserialize(value); } @SuppressWarnings("unchecked") V deserializeValue(byte[] value) { - return (V) valueSerializer.deserialize(value); + return (V) valueSerializer().deserialize(value); } String deserializeString(byte[] value) { - return (String) stringSerializer.deserialize(value); + return (String) stringSerializer().deserialize(value); } @SuppressWarnings( { "unchecked" }) HK deserializeHashKey(byte[] value) { - return (HK) hashKeySerializer.deserialize(value); + return (HK) hashKeySerializer().deserialize(value); } @SuppressWarnings("unchecked") HV deserializeHashValue(byte[] value) { - return (HV) hashValueSerializer.deserialize(value); + return (HV) hashValueSerializer().deserialize(value); } } \ No newline at end of file diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java index 968da3221..0031b676f 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java @@ -58,7 +58,7 @@ class DefaultBoundZSetOperations extends DefaultBoundKeyOperations impl } - public void intersectAndStore(K destKey, K otherKey) { + public void intersectAndStore(K otherKey, K destKey) { ops.intersectAndStore(getKey(), otherKey, destKey); } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java index 63ab5d37d..f34689880 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java @@ -49,8 +49,6 @@ class DefaultSetOperations extends AbstractOperations implements Set return difference(key, Collections.singleton(otherKey)); } - @SuppressWarnings("unchecked") - public Set difference(final K key, final Collection otherKeys) { final byte[][] rawKeys = rawKeys(key, otherKeys); Set rawValues = execute(new RedisCallback>() { @@ -64,19 +62,18 @@ class DefaultSetOperations extends AbstractOperations implements Set } - public void differenceAndStore(K key, K otherKey, K destKey) { - differenceAndStore(key, Collections.singleton(otherKey), destKey); + public Long differenceAndStore(K key, K otherKey, K destKey) { + return differenceAndStore(key, Collections.singleton(otherKey), destKey); } - public void differenceAndStore(final K key, final Collection otherKeys, K destKey) { + public Long differenceAndStore(final K key, final Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.sDiffStore(rawDestKey, rawKeys); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.sDiffStore(rawDestKey, rawKeys); } }, true); } @@ -86,8 +83,6 @@ class DefaultSetOperations extends AbstractOperations implements Set return intersect(key, Collections.singleton(otherKey)); } - @SuppressWarnings("unchecked") - public Set intersect(K key, Collection otherKeys) { final byte[][] rawKeys = rawKeys(key, otherKeys); Set rawValues = execute(new RedisCallback>() { @@ -101,17 +96,17 @@ class DefaultSetOperations extends AbstractOperations implements Set } - public void intersectAndStore(K key, K otherKey, K destKey) { - intersectAndStore(key, Collections.singleton(otherKey), destKey); + public Long intersectAndStore(K key, K otherKey, K destKey) { + return intersectAndStore(key, Collections.singleton(otherKey), destKey); } - public void intersectAndStore(K key, Collection otherKeys, K destKey) { + public Long intersectAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { + public Long doInRedis(RedisConnection connection) { connection.sInterStore(rawDestKey, rawKeys); return null; } @@ -130,8 +125,6 @@ class DefaultSetOperations extends AbstractOperations implements Set }, true); } - @SuppressWarnings("unchecked") - public Set members(K key) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { @@ -222,19 +215,18 @@ class DefaultSetOperations extends AbstractOperations implements Set } - public void unionAndStore(K key, K otherKey, K destKey) { - unionAndStore(key, Collections.singleton(otherKey), destKey); + public Long unionAndStore(K key, K otherKey, K destKey) { + return unionAndStore(key, Collections.singleton(otherKey), destKey); } - public void unionAndStore(K key, Collection otherKeys, K destKey) { + public Long unionAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.sUnionStore(rawDestKey, rawKeys); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.sUnionStore(rawDestKey, rawKeys); } }, true); } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java index 133158b63..8d6532036 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java @@ -73,10 +73,6 @@ class DefaultValueOperations extends AbstractOperations implements V return connection.decr(rawKey); } - if (delta < 0) { - return connection.decrBy(rawKey, delta); - } - return connection.incrBy(rawKey, delta); } }, true); @@ -109,8 +105,6 @@ class DefaultValueOperations extends AbstractOperations implements V return deserializeString(rawReturn); } - @SuppressWarnings("unchecked") - public List multiGet(Collection keys) { if (keys.isEmpty()) { return Collections.emptyList(); diff --git a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java index 5cf540faa..79382b4f2 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java @@ -60,19 +60,18 @@ class DefaultZSetOperations extends AbstractOperations implements ZS } - public void intersectAndStore(K key, K otherKey, K destKey) { - intersectAndStore(key, Collections.singleton(otherKey), destKey); + public Long intersectAndStore(K key, K otherKey, K destKey) { + return intersectAndStore(key, Collections.singleton(otherKey), destKey); } - public void intersectAndStore(K key, Collection otherKeys, K destKey) { + public Long intersectAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.zInterStore(rawDestKey, rawKeys); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.zInterStore(rawDestKey, rawKeys); } }, true); } @@ -233,25 +232,23 @@ class DefaultZSetOperations extends AbstractOperations implements ZS } - public void removeRange(K key, final long start, final long end) { + public Long removeRange(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.zRemRange(rawKey, start, end); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.zRemRange(rawKey, start, end); } }, true); } - public void removeRangeByScore(K key, final double min, final double max) { + public Long removeRangeByScore(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.zRemRangeByScore(rawKey, min, max); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.zRemRangeByScore(rawKey, min, max); } }, true); } @@ -294,19 +291,18 @@ class DefaultZSetOperations extends AbstractOperations implements ZS } - public void unionAndStore(K key, K otherKey, K destKey) { - unionAndStore(key, Collections.singleton(otherKey), destKey); + public Long unionAndStore(K key, K otherKey, K destKey) { + return unionAndStore(key, Collections.singleton(otherKey), destKey); } - public void unionAndStore(K key, Collection otherKeys, K destKey) { + public Long unionAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.zUnionStore(rawDestKey, rawKeys); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.zUnionStore(rawDestKey, rawKeys); } }, true); } diff --git a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java index 02feabe07..3f65b35c2 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java +++ b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java @@ -81,14 +81,8 @@ public abstract class RedisConnectionUtils { RedisConnection conn = factory.getConnection(); - boolean synchronizationActive = TransactionSynchronizationManager.isSynchronizationActive(); - - if (bind || synchronizationActive) { + if (bind) { connHolder = new RedisConnectionHolder(conn); - if (synchronizationActive) { - TransactionSynchronizationManager.registerSynchronization(new RedisConnectionSynchronization( - connHolder, factory, true)); - } TransactionSynchronizationManager.bindResource(factory, connHolder); return connHolder.getConnection(); } diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java index cf9c54964..5a404083c 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java +++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java @@ -160,16 +160,16 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation try { RedisConnection connToExpose = (exposeConnection ? conn : createRedisConnectionProxy(conn)); T result = action.doInRedis(connToExpose); + + // close pipeline + if (pipeline && !pipelineStatus) { + conn.closePipeline(); + } + // TODO: any other connection processing? return postProcessResult(result, conn, existingConnection); } finally { - try { - if (pipeline && !pipelineStatus) { - conn.closePipeline(); - } - } finally { - RedisConnectionUtils.releaseConnection(conn, factory); - } + RedisConnectionUtils.releaseConnection(conn, factory); } } diff --git a/src/main/java/org/springframework/data/redis/core/SetOperations.java b/src/main/java/org/springframework/data/redis/core/SetOperations.java index b8a078bec..f54be4325 100644 --- a/src/main/java/org/springframework/data/redis/core/SetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/SetOperations.java @@ -30,25 +30,25 @@ public interface SetOperations { Set difference(K key, Collection otherKeys); - void differenceAndStore(K key, K otherKey, K destKey); + Long differenceAndStore(K key, K otherKey, K destKey); - void differenceAndStore(K key, Collection otherKeys, K destKey); + Long differenceAndStore(K key, Collection otherKeys, K destKey); Set intersect(K key, K otherKey); Set intersect(K key, Collection otherKeys); - void intersectAndStore(K key, K otherKey, K destKey); + Long intersectAndStore(K key, K otherKey, K destKey); - void intersectAndStore(K key, Collection otherKeys, K destKey); + Long intersectAndStore(K key, Collection otherKeys, K destKey); Set union(K key, K otherKey); Set union(K key, Collection otherKeys); - void unionAndStore(K key, K otherKey, K destKey); + Long unionAndStore(K key, K otherKey, K destKey); - void unionAndStore(K key, Collection otherKeys, K destKey); + Long unionAndStore(K key, Collection otherKeys, K destKey); Boolean add(K key, V value); diff --git a/src/main/java/org/springframework/data/redis/core/ZSetOperations.java b/src/main/java/org/springframework/data/redis/core/ZSetOperations.java index 54a363d1e..4014e4c9e 100644 --- a/src/main/java/org/springframework/data/redis/core/ZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ZSetOperations.java @@ -35,13 +35,13 @@ public interface ZSetOperations { Double getScore(); } - void intersectAndStore(K key, K otherKey, K destKey); + Long intersectAndStore(K key, K otherKey, K destKey); - void intersectAndStore(K key, Collection otherKeys, K destKey); + Long intersectAndStore(K key, Collection otherKeys, K destKey); - void unionAndStore(K key, K otherKey, K destKey); + Long unionAndStore(K key, K otherKey, K destKey); - void unionAndStore(K key, Collection otherKeys, K destKey); + Long unionAndStore(K key, Collection otherKeys, K destKey); Set range(K key, long start, long end); @@ -71,9 +71,9 @@ public interface ZSetOperations { Boolean remove(K key, Object o); - void removeRange(K key, long start, long end); + Long removeRange(K key, long start, long end); - void removeRangeByScore(K key, double min, double max); + Long removeRangeByScore(K key, double min, double max); Long count(K key, double min, double max); diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index 972c00c8a..94badf377 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -115,6 +115,15 @@ public abstract class AbstractConnectionIntegrationTests { assertEquals("PONG", connection.ping()); } + @Test + public void testBitSet() throws Exception { + String key = "bitset-test"; + connection.setBit(key, 0, false); + connection.setBit(key, 1, true); + assertTrue(!connection.getBit(key, 0)); + assertTrue(connection.getBit(key, 1)); + } + @Test public void testInfo() throws Exception { Properties info = connection.info(); @@ -323,4 +332,12 @@ public abstract class AbstractConnectionIntegrationTests { th.start(); connection.pSubscribe(listener, expectedPattern); } + + @Test + public void testExecuteNative() throws Exception { + connection.execute("ZADD", getClass() + "#testExecuteNative", "0.9090", "item"); + //connection.execute("PiNg"); + connection.execute("iNFo"); + connection.execute("SET ", getClass() + "testSetNative", UUID.randomUUID().toString()); + } } \ No newline at end of file diff --git a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java index 6ddc7df89..c38a6134c 100644 --- a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.jredis.JredisConnectionFactory; public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrationTests { @@ -86,6 +85,10 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat @Ignore public void testPubSubWithNamedChannels() { - } + + @Ignore + public void testBitSet() throws Exception { + } + } \ No newline at end of file diff --git a/src/test/java/org/springframework/data/redis/core/TemplateTest.java b/src/test/java/org/springframework/data/redis/core/TemplateTest.java index 5aac04dc4..c665fb621 100644 --- a/src/test/java/org/springframework/data/redis/core/TemplateTest.java +++ b/src/test/java/org/springframework/data/redis/core/TemplateTest.java @@ -15,16 +15,21 @@ */ package org.springframework.data.redis.core; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Collection; +import java.util.List; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.springframework.dao.DataAccessException; import org.springframework.data.redis.ConnectionFactoryTracker; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.rjc.RjcConnectionFactory; import org.springframework.data.redis.support.collections.CollectionTestParams; import org.springframework.data.redis.support.collections.ObjectFactory; @@ -56,4 +61,36 @@ public class TemplateTest { public void testKeys() throws Exception { assertTrue(template.keys("*") != null); } + + @Test + public void testIncrement() throws Exception { + // disable in case of Rjc + if (isRjc()) { + return; + } + + StringRedisTemplate sr = new StringRedisTemplate(template.getConnectionFactory()); + String key = "test.template.inc"; + ValueOperations valueOps = sr.opsForValue(); + valueOps.set(key, "10"); + valueOps.increment(key, -10); + assertEquals(0, Integer.valueOf(valueOps.get(key)).intValue()); + valueOps.increment(key, -10); + assertEquals(-10, Integer.valueOf(valueOps.get(key)).intValue()); + } + + private boolean isRjc() { + return (template.getConnectionFactory() instanceof RjcConnectionFactory); + } + + //@Test + public void testGetNonExistingKey() throws Exception { + List res = (List) template.execute(new RedisCallback>() { + + public List doInRedis(RedisConnection connection) throws DataAccessException { + connection.hGet("non-existing-key".getBytes(), "some-value".getBytes()); + return connection.closePipeline(); + } + }, true, true); + } }