Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support zRem with multiple values

Browse Source 
DATAREDIS-99
This commit is contained in:
Jennifer Hickey
2013-08-01 18:29:29 -07:00
parent 44460dfdee
commit c318f24c13
21 changed files with 93 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java
View File

@@ -1048,8 +1048,8 @@ public class DefaultStringRedisConnection implements StringRedisConnection {
return result;
}
public Boolean zRem(byte[] key, byte[] value) {
Boolean result = delegate.zRem(key, value);
public Long zRem(byte[] key, byte[]... values) {
Long result = delegate.zRem(key, values);
if(isFutureConversion()) {
addResultConverter(identityConverter);
}
@@ -2050,8 +2050,8 @@ public class DefaultStringRedisConnection implements StringRedisConnection {
}
public Boolean zRem(String key, String value) {
Boolean result = delegate.zRem(serialize(key), serialize(value));
public Long zRem(String key, String... values) {
Long result = delegate.zRem(serialize(key), serializeMulti(values));
if(isFutureConversion()) {
addResultConverter(identityConverter);
}

2
src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java
View File

@@ -46,7 +46,7 @@ public interface RedisZSetCommands {
Long zAdd(byte[] key, Set<Tuple> tuples);
Boolean zRem(byte[] key, byte[] value);
Long zRem(byte[] key, byte[]... values);
Double zIncrBy(byte[] key, double increment, byte[] value);

2
src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java
View File

@@ -193,7 +193,7 @@ public interface StringRedisConnection extends RedisConnection {
Long zAdd(String key, Set<StringTuple> tuples);
Boolean zRem(String key, String value);
Long zRem(String key, String... values);
Double zIncrBy(String key, double increment, String value);

12
src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
View File

@@ -2209,17 +2209,21 @@ public class JedisConnection implements RedisConnection {
}
public Boolean zRem(byte[] key, byte[] value) {
public Long zRem(byte[] key, byte[]... values) {
if((isPipelined() || isQueueing()) && values.length > 1) {
throw new UnsupportedOperationException("zRem of multiple fields not supported " +
"in pipeline or transaction");
}
try {
if (isPipelined()) {
pipeline(new JedisResult(pipeline.zrem(key, value), JedisConverters.longToBoolean()));
pipeline(new JedisResult(pipeline.zrem(key, values[0])));
return null;
}
if (isQueueing()) {
transaction(new JedisResult(transaction.zrem(key, value), JedisConverters.longToBoolean()));
transaction(new JedisResult(transaction.zrem(key, values[0])));
return null;
}
return JedisConverters.toBoolean(jedis.zrem(key, value));
return jedis.zrem(key, values);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}

7
src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java
View File

@@ -1057,9 +1057,12 @@ public class JredisConnection implements RedisConnection {
}
public Boolean zRem(byte[] key, byte[] value) {
public Long zRem(byte[] key, byte[]... values) {
if(values.length > 1) {
throw new UnsupportedOperationException("zRem of multiple fields not supported");
}
try {
return jredis.zrem(key, value);
return JredisUtils.toLong(jredis.zrem(key, values[0]));
} catch (Exception ex) {
throw convertJredisAccessException(ex);
}

8
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View File

@@ -2304,17 +2304,17 @@ public class LettuceConnection implements RedisConnection {
}
}
public Boolean zRem(byte[] key, byte[] value) {
public Long zRem(byte[] key, byte[]... values) {
try {
if (isPipelined()) {
pipeline(new LettuceResult(getAsyncConnection().zrem(key, value), LettuceConverters.longToBoolean()));
pipeline(new LettuceResult(getAsyncConnection().zrem(key, values)));
return null;
}
if (isQueueing()) {
transaction(new LettuceTxResult(getConnection().zrem(key, value), LettuceConverters.longToBoolean()));
transaction(new LettuceTxResult(getConnection().zrem(key, values)));
return null;
}
return LettuceConverters.toBoolean(getConnection().zrem(key, value));
return getConnection().zrem(key, values);
} catch (Exception ex) {
throw convertLettuceAccessException(ex);
}

6
src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
View File

@@ -1775,13 +1775,13 @@ public class SrpConnection implements RedisConnection {
}
public Boolean zRem(byte[] key, byte[] value) {
public Long zRem(byte[] key, byte[]... values) {
try {
if (isPipelined()) {
pipeline(new SrpResult(pipeline.zrem(key, new Object[] { value }), SrpConverters.longToBoolean()));
pipeline(new SrpResult(pipeline.zrem(key, (Object[]) values)));
return null;
}
return SrpConverters.toBoolean(client.zrem(key, new Object[] { value }).data());
return client.zrem(key, (Object[]) values).data();
} catch (Exception ex) {
throw convertSrpAccessException(ex);
}

2
src/main/java/org/springframework/data/redis/core/BoundZSetOperations.java
View File

@@ -69,7 +69,7 @@ public interface BoundZSetOperations<K, V> extends BoundKeyOperations<K> {
Long reverseRank(Object o);
Boolean remove(Object o);
Long remove(Object... values);
Long count(double min, double max);

4
src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java
View File

@@ -121,8 +121,8 @@ class DefaultBoundZSetOperations<K, V> extends DefaultBoundKeyOperations<K> impl
}
public Boolean remove(Object o) {
return ops.remove(getKey(), o);
public Long remove(Object... values) {
return ops.remove(getKey(), values);
}

10
src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java
View File

@@ -281,14 +281,14 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
}
public Boolean remove(K key, Object o) {
public Long remove(K key, Object... values) {
final byte[] rawKey = rawKey(key);
final byte[] rawValue = rawValue(o);
final byte[][] rawValues = rawValues(values);
return execute(new RedisCallback<Boolean>() {
return execute(new RedisCallback<Long>() {
public Boolean doInRedis(RedisConnection connection) {
return connection.zRem(rawKey, rawValue);
public Long doInRedis(RedisConnection connection) {
return connection.zRem(rawKey, rawValues);
}
}, true);
}

2
src/main/java/org/springframework/data/redis/core/ZSetOperations.java
View File

@@ -79,7 +79,7 @@ public interface ZSetOperations<K, V> {
Double score(K key, Object o);
Boolean remove(K key, Object o);
Long remove(K key, Object... values);
Long removeRange(K key, long start, long end);

4
src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java
View File

@@ -202,9 +202,9 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
public boolean remove(Object o) {
Boolean result = boundZSetOps.remove(o);
Long result = boundZSetOps.remove(o);
checkResult(result);
return result;
return result == 1;
}

15
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -1696,10 +1696,23 @@ public abstract class AbstractConnectionIntegrationTests {
actual.add(connection.zRem("myset", "James"));
actual.add(connection.zRange("myset", 0l, -1l));
verifyResults(
Arrays.asList(new Object[] { true, true, true,
Arrays.asList(new Object[] { true, true, 1l,
new LinkedHashSet<String>(Arrays.asList(new String[] { "Bob" })) }));
}
@Test
public void testZRemMultiple() {
actual.add(connection.zAdd("myset", 2, "Bob"));
actual.add(connection.zAdd("myset", 1, "James"));
actual.add(connection.zAdd("myset", 0.5, "Joe"));
actual.add(connection.zAdd("myset", 2.5, "Jen"));
actual.add(connection.zRem("myset", "James", "Jen"));
actual.add(connection.zRange("myset", 0l, -1l));
verifyResults(
Arrays.asList(new Object[] { true, true, true, true, 2l,
new LinkedHashSet<String>(Arrays.asList(new String[] { "Joe", "Bob" })) }));
}
@Test
public void testZRemRangeByRank() {
actual.add(connection.zAdd("myset", 2, "Bob"));

4
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java
View File

@@ -1203,13 +1203,13 @@ public class DefaultStringRedisConnectionPipelineTests extends DefaultStringRedi
@Test
public void testZRemBytes() {
doReturn(Arrays.asList(new Object[] { true })).when(nativeConnection).closePipeline();
doReturn(Arrays.asList(new Object[] { 1l })).when(nativeConnection).closePipeline();
super.testZRemBytes();
}
@Test
public void testZRem() {
doReturn(Arrays.asList(new Object[] { true })).when(nativeConnection).closePipeline();
doReturn(Arrays.asList(new Object[] { 1l })).when(nativeConnection).closePipeline();
super.testZRem();
}

4
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java
View File

@@ -1171,13 +1171,13 @@ public class DefaultStringRedisConnectionPipelineTxTests extends
@Test
public void testZRemBytes() {
doReturn(Arrays.asList(new Object[] {Arrays.asList(new Object[] { true })})).when(nativeConnection).closePipeline();
doReturn(Arrays.asList(new Object[] {Arrays.asList(new Object[] { 1l })})).when(nativeConnection).closePipeline();
super.testZRemBytes();
}
@Test
public void testZRem() {
doReturn(Arrays.asList(new Object[] {Arrays.asList(new Object[] { true })})).when(nativeConnection).closePipeline();
doReturn(Arrays.asList(new Object[] {Arrays.asList(new Object[] { 1l })})).when(nativeConnection).closePipeline();
super.testZRem();
}

8
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java
View File

@@ -1440,16 +1440,16 @@ public class DefaultStringRedisConnectionTests {
@Test
public void testZRemBytes() {
doReturn(true).when(nativeConnection).zRem(fooBytes, barBytes);
doReturn(1l).when(nativeConnection).zRem(fooBytes, barBytes);
actual.add(connection.zRem(fooBytes, barBytes));
verifyResults(Arrays.asList(new Object[] { true }));
verifyResults(Arrays.asList(new Object[] { 1l }));
}
@Test
public void testZRem() {
doReturn(true).when(nativeConnection).zRem(fooBytes, barBytes);
doReturn(1l).when(nativeConnection).zRem(fooBytes, barBytes);
actual.add(connection.zRem(foo, bar));
verifyResults(Arrays.asList(new Object[] { true }));
verifyResults(Arrays.asList(new Object[] { 1l }));
}
@Test

4
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTxTests.java
View File

@@ -1170,13 +1170,13 @@ public class DefaultStringRedisConnectionTxTests extends DefaultStringRedisConne
@Test
public void testZRemBytes() {
doReturn(Arrays.asList(new Object[] { true })).when(nativeConnection).exec();
doReturn(Arrays.asList(new Object[] { 1l })).when(nativeConnection).exec();
super.testZRemBytes();
}
@Test
public void testZRem() {
doReturn(Arrays.asList(new Object[] { true })).when(nativeConnection).exec();
doReturn(Arrays.asList(new Object[] { 1l })).when(nativeConnection).exec();
super.testZRem();
}

5
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java
View File

@@ -456,4 +456,9 @@ public class JedisConnectionPipelineIntegrationTests extends
public void testZAddMultiple() {
super.testZAddMultiple();
}
@Test(expected=UnsupportedOperationException.class)
public void testZRemMultiple() {
super.testZRemMultiple();
}
}

5
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java
View File

@@ -392,4 +392,9 @@ public class JedisConnectionTransactionIntegrationTests extends
public void testZAddMultiple() {
super.testZAddMultiple();
}
@Test(expected=UnsupportedOperationException.class)
public void testZRemMultiple() {
super.testZRemMultiple();
}
}

5
src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java
View File

@@ -590,6 +590,11 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat
super.testZAddMultiple();
}
@Test(expected=UnsupportedOperationException.class)
public void testZRemMultiple() {
super.testZRemMultiple();
}
// Jredis returns null for rPush and lPush
@Test
public void testLLen() {

17
src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java
View File

@@ -176,4 +176,21 @@ public class DefaultZSetOperationsTests<K,V> {
expected.add(value2);
assertThat(zSetOps.range(key, 0, -1), isEqual(expected));
}
@Test
public void testRemove() {
K key = keyFactory.instance();
V value1 = valueFactory.instance();
V value2 = valueFactory.instance();
V value3 = valueFactory.instance();
Set<TypedTuple<V>> values = new HashSet<TypedTuple<V>>();
values.add(new DefaultTypedTuple<V>(value1, 1.7));
values.add(new DefaultTypedTuple<V>(value2, 3.2));
values.add(new DefaultTypedTuple<V>(value3, 0.8));
assertEquals(Long.valueOf(3), zSetOps.add(key, values));
assertEquals(Long.valueOf(2), zSetOps.remove(key, value1, value3));
Set<V> expected = new LinkedHashSet<V>();
expected.add(value2);
assertThat(zSetOps.range(key, 0, -1), isEqual(expected));
}
}