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

DATAREDIS-674 - Polishing.

Browse Source 
Rename JedisConverters.zAddArgsConvertor(…) to toTupleMap(…) and reorder method to group with other tuple conversion methods. Add author tags.

Create tests for zadd with tuple using Redis Cluster. Enable pipelining and transactions for zadd using Jedis. Adopt tests.

Original pull request: #263.
This commit is contained in:
Mark Paluch
2017-08-25 14:09:46 +02:00
parent 42ba71a2b2
commit 95500d4d72
7 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
View File

@@ -19,7 +19,6 @@ import redis.clients.jedis.ScanParams;
import redis.clients.jedis.ZParams;
import java.util.Set;
import java.util.Map;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -66,10 +65,8 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
@Override
public Long zAdd(byte[] key, Set<Tuple> tuples) {
Map<byte[], Double> args = JedisConverters.zAddArgsConvertor(tuples);
try {
return connection.getCluster().zadd(key, args);
return connection.getCluster().zadd(key, JedisConverters.toTupleMap(tuples));
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}

61
src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java
View File

@@ -238,6 +238,38 @@ abstract public class JedisConverters extends Converters {
return TUPLE_SET_TO_TUPLE_SET.convert(source);
}
/**
* Map a {@link Set} of {@link Tuple} by {@code value} to its {@code score}.
*
* @param tuples must not be {@literal null}.
* @return
* @since 2.0
*/
public static Map<byte[], Double> toTupleMap(Set<Tuple> tuples) {
Assert.notNull(tuples, "Tuple set must not be null!");
Map<byte[], Double> args = new LinkedHashMap<>(tuples.size(), 1);
Set<Double> scores = new HashSet<>(tuples.size(), 1);
boolean isAtLeastJedis24 = JedisVersionUtil.atLeastJedis24();
for (Tuple tuple : tuples) {
if (!isAtLeastJedis24) {
if (scores.contains(tuple.getScore())) {
throw new UnsupportedOperationException(
"Bulk add of multiple elements with the same score is not supported. Add the elements individually.");
}
scores.add(tuple.getScore());
}
args.put(tuple.getValue(), tuple.getScore());
}
return args;
}
public static byte[] toBytes(Integer source) {
return String.valueOf(source).getBytes();
}
@@ -660,33 +692,4 @@ abstract public class JedisConverters extends Converters {
}
}
}
/**
* Convert tuples to map of bytes and double.
* Bytes represents the value of the element and double is for the score.
* @param tuples
* @return
*/
public static Map<byte[], Double> zAddArgsConvertor(Set<Tuple> tuples) {
Map<byte[], Double> args = new LinkedHashMap<>(tuples.size(), 1);
Set<Double> scores = new HashSet<>(tuples.size(), 1);
boolean isAtLeastJedis24 = JedisVersionUtil.atLeastJedis24();
for (Tuple tuple : tuples) {
if (!isAtLeastJedis24) {
if (scores.contains(tuple.getScore())) {
throw new UnsupportedOperationException(
"Bulk add of multiple elements with the same score is not supported. Add the elements individually.");
}
scores.add(tuple.getScore());
}
args.put(tuple.getValue(), tuple.getScore());
}
return args;
}
}

18
src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
View File

@@ -19,7 +19,6 @@ import redis.clients.jedis.ScanParams;
import redis.clients.jedis.ScanResult;
import redis.clients.jedis.ZParams;
import java.util.Map;
import java.util.Set;
import org.springframework.data.redis.connection.RedisZSetCommands;
@@ -32,6 +31,7 @@ import org.springframework.util.Assert;
/**
* @author Christoph Strobl
* @author Clement Ong
* @since 2.0
*/
class JedisZSetCommands implements RedisZSetCommands {
@@ -73,13 +73,17 @@ class JedisZSetCommands implements RedisZSetCommands {
@Override
public Long zAdd(byte[] key, Set<Tuple> tuples) {
if (isPipelined() || isQueueing()) {
throw new UnsupportedOperationException("zAdd of multiple fields not supported " + "in pipeline or transaction");
}
Map<byte[], Double> args = JedisConverters.zAddArgsConvertor(tuples);
try {
return connection.getJedis().zadd(key, args);
if (isPipelined()) {
pipeline(connection.newJedisResult(connection.getPipeline().zadd(key, JedisConverters.toTupleMap(tuples))));
return null;
}
if (isQueueing()) {
transaction(
connection.newJedisResult(connection.getTransaction().zadd(key, JedisConverters.toTupleMap(tuples))));
return null;
}
return connection.getJedis().zadd(key, JedisConverters.toTupleMap(tuples));
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}

12
src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java
View File

@@ -1159,6 +1159,18 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests {
assertThat(nativeConnection.zcard(KEY_1_BYTES), is(2L));
}
@Test // DATAREDIS-674
public void zAddShouldAddMultipleValuesWithScoreCorrectly() {
Set<Tuple> tuples = new HashSet<>();
tuples.add(new DefaultTuple(VALUE_1_BYTES, 10D));
tuples.add(new DefaultTuple(VALUE_2_BYTES, 20D));
clusterConnection.zAdd(KEY_1_BYTES, tuples);
assertThat(nativeConnection.zcard(KEY_1_BYTES), is(2L));
}
@Test // DATAREDIS-315
public void zRemShouldRemoveValueWithScoreCorrectly() {

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

@@ -37,10 +37,11 @@ import redis.clients.jedis.JedisPoolConfig;
/**
* Integration test of {@link JedisConnection} pipeline functionality
*
*
* @author Jennifer Hickey
* @author Christoph Strobl
* @author Thomas Darimont
* @author Mark Paluch
*/
@RunWith(RelaxedJUnit4ClassRunner.class)
@ContextConfiguration("JedisConnectionIntegrationTests-context.xml")
@@ -250,11 +251,6 @@ public class JedisConnectionPipelineIntegrationTests extends AbstractConnectionP
super.testInfoBySection();
}
@Test(expected = UnsupportedOperationException.class)
public void testZAddMultiple() {
super.testZAddMultiple();
}
@Test(expected = UnsupportedOperationException.class) // DATAREDIS-269
public void clientSetNameWorksCorrectly() {
super.clientSetNameWorksCorrectly();

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

@@ -30,8 +30,9 @@ import org.springframework.test.context.ContextConfiguration;
* <p>
* Each method of {@link JedisConnection} behaves differently if executed with a transaction (i.e. between multi and
* exec or discard calls), so this test covers those branching points
*
*
* @author Jennifer Hickey
* @author Mark Paluch
*/
@RunWith(RelaxedJUnit4ClassRunner.class)
@ContextConfiguration("JedisConnectionIntegrationTests-context.xml")
@@ -181,11 +182,6 @@ public class JedisConnectionTransactionIntegrationTests extends AbstractConnecti
super.testInfoBySection();
}
@Test(expected = UnsupportedOperationException.class)
public void testZAddMultiple() {
super.testZAddMultiple();
}
@Test(expected = InvalidDataAccessApiUsageException.class)
@IfProfileValue(name = "redisVersion", value = "2.6+")
public void testRestoreBadData() {

17
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java
View File

@@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -92,8 +93,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
static final GeoLocation<String> CATANIA = new GeoLocation<>("catania", POINT_CATANIA);
static final GeoLocation<String> PALERMO = new GeoLocation<>("palermo", POINT_PALERMO);
static final GeoLocation<byte[]> ARIGENTO_BYTES = new GeoLocation<>(
"arigento".getBytes(Charset.forName("UTF-8")), POINT_ARIGENTO);
static final GeoLocation<byte[]> ARIGENTO_BYTES = new GeoLocation<>("arigento".getBytes(Charset.forName("UTF-8")),
POINT_ARIGENTO);
static final GeoLocation<byte[]> CATANIA_BYTES = new GeoLocation<>("catania".getBytes(Charset.forName("UTF-8")),
POINT_CATANIA);
static final GeoLocation<byte[]> PALERMO_BYTES = new GeoLocation<>("palermo".getBytes(Charset.forName("UTF-8")),
@@ -1165,6 +1166,18 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
assertThat(nativeConnection.zcard(KEY_1), is(2L));
}
@Test // DATAREDIS-674
public void zAddShouldAddMultipleValuesWithScoreCorrectly() {
Set<Tuple> tuples = new HashSet<>();
tuples.add(new DefaultTuple(VALUE_1_BYTES, 10D));
tuples.add(new DefaultTuple(VALUE_2_BYTES, 20D));
clusterConnection.zAdd(KEY_1_BYTES, tuples);
assertThat(nativeConnection.zcard(KEY_1), is(2L));
}
@Test // DATAREDIS-315
public void zRemShouldRemoveValueWithScoreCorrectly() {