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

Support lPush with multiple values

Browse Source 
DATAREDIS-99
This commit is contained in:
Jennifer Hickey
2013-07-31 18:09:56 -07:00
parent 8f362b481c
commit 36780d14a1
17 changed files with 87 additions and 20 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

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

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

@@ -34,7 +34,7 @@ public interface RedisListCommands {
Long rPush(byte[] key, byte[] value);
Long lPush(byte[] key, byte[] value);
Long lPush(byte[] key, byte[]... value);
Long rPushX(byte[] key, byte[] value);

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

@@ -127,7 +127,7 @@ public interface StringRedisConnection extends RedisConnection {
Long rPush(String key, String value);
Long lPush(String key, String value);
Long lPush(String key, String... values);
Long rPushX(String key, String value);

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

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

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

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

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

@@ -1421,17 +1421,17 @@ public class LettuceConnection implements RedisConnection {
//
public Long lPush(byte[] key, byte[] value) {
public Long lPush(byte[] key, byte[]... values) {
try {
if (isPipelined()) {
pipeline(new LettuceResult(getAsyncConnection().lpush(key, value)));
pipeline(new LettuceResult(getAsyncConnection().lpush(key, values)));
return null;
}
if (isQueueing()) {
transaction(new LettuceTxResult(getConnection().lpush(key, value)));
transaction(new LettuceTxResult(getConnection().lpush(key, values)));
return null;
}
return getConnection().lpush(key, value);
return getConnection().lpush(key, values);
} catch (Exception ex) {
throw convertLettuceAccessException(ex);
}

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

@@ -1106,13 +1106,13 @@ public class SrpConnection implements RedisConnection {
// List commands
//
public Long lPush(byte[] key, byte[] value) {
public Long lPush(byte[] key, byte[]... values) {
try {
if (isPipelined()) {
pipeline(new SrpResult(pipeline.lpush(key, new Object[] { value })));
pipeline(new SrpResult(pipeline.lpush(key, (Object[]) values)));
return null;
}
return client.lpush(key, new Object[] { value }).data();
return client.lpush(key, (Object[]) values ).data();
} catch (Exception ex) {
throw convertSrpAccessException(ex);
}

9
src/main/java/org/springframework/data/redis/core/AbstractOperations.java
View File

@@ -111,6 +111,15 @@ abstract class AbstractOperations<K, V> {
return valueSerializer().serialize(value);
}
byte[][] rawValues(Object... values) {
final byte[][] rawValues = new byte[values.length][];
int i = 0;
for (Object value : values) {
rawValues[i++] = rawValue(value);
}
return rawValues;
}
@SuppressWarnings("unchecked")
<HK> byte[] rawHashKey(HK hashKey) {
Assert.notNull(hashKey, "non null hash key required");

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

@@ -35,6 +35,8 @@ public interface BoundListOperations<K, V> extends BoundKeyOperations<K> {
Long leftPush(V value);
Long leftPushAll(V... values);
Long leftPushIfPresent(V value);
Long leftPush(V pivot, V value);

3
src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java
View File

@@ -67,6 +67,9 @@ class DefaultBoundListOperations<K, V> extends DefaultBoundKeyOperations<K> impl
return ops.leftPush(getKey(), value);
}
public Long leftPushAll(V... values) {
return ops.leftPushAll(getKey(), values);
}
public Long leftPushIfPresent(V value) {
return ops.leftPushIfPresent(getKey(), value);

11
src/main/java/org/springframework/data/redis/core/DefaultListOperations.java
View File

@@ -76,7 +76,16 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
}, true);
}
public Long leftPushAll(K key, V... values) {
final byte[] rawKey = rawKey(key);
final byte[][] rawValues = rawValues(values);
return execute(new RedisCallback<Long>() {
public Long doInRedis(RedisConnection connection) {
return connection.lPush(rawKey, rawValues);
}
}, true);
}
public Long leftPushIfPresent(K key, V value) {
final byte[] rawKey = rawKey(key);
final byte[] rawValue = rawValue(value);

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

@@ -33,6 +33,8 @@ public interface ListOperations<K, V> {
Long leftPush(K key, V value);
Long leftPushAll(K key, V... values);
Long leftPushIfPresent(K key, V value);
Long leftPush(K key, V pivot, V value);

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

@@ -1259,6 +1259,14 @@ public abstract class AbstractConnectionIntegrationTests {
Arrays.asList(new String[] { "baz", "bar" }) }));
}
@Test
public void testLPushMultiple() {
actual.add(connection.lPush("testlist", "bar", "baz"));
actual.add(connection.lRange("testlist", 0, -1));
verifyResults(Arrays.asList(new Object[] { 2l,
Arrays.asList(new String[] { "baz", "bar" }) }));
}
// Set operations
@Test

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

@@ -431,4 +431,9 @@ public class JedisConnectionPipelineIntegrationTests extends
public void testHDelMultiple() {
super.testHDelMultiple();
}
@Test(expected=UnsupportedOperationException.class)
public void testLPushMultiple() {
super.testLPushMultiple();
}
}

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

@@ -367,4 +367,9 @@ public class JedisConnectionTransactionIntegrationTests extends
public void testHDelMultiple() {
super.testHDelMultiple();
}
@Test(expected=UnsupportedOperationException.class)
public void testLPushMultiple() {
super.testLPushMultiple();
}
}

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

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

12
src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java
View File

@@ -106,6 +106,18 @@ public class DefaultListOperationsTests<K,V> {
assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] {v2, v1})));
}
@SuppressWarnings("unchecked")
@Test
public void testLeftPushAll() {
K key = keyFactory.instance();
V v1 = valueFactory.instance();
V v2 = valueFactory.instance();
V v3 = valueFactory.instance();
assertEquals(Long.valueOf(2),listOps.leftPushAll(key, v1, v2));
assertEquals(Long.valueOf(3), listOps.leftPush(key, v3));
assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] {v3, v2, v1})));
}
@Test
public void testRightPopAndLeftPushTimeout() {
// 1 ms timeout gets upgraded to 1 sec timeout at the moment