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

DATAREDIS-306 - Add support for ZSCAN.

Browse Source 
ZSCAN is directly supported by jedis and can be emulated for lettuce via eval.

SRP and JRedis will throw UnsupportedOperationException.

Original pull request: #80.
This commit is contained in:
Christoph Strobl
2014-06-02 21:35:05 +02:00
committed by Thomas Darimont
parent f6e88989f1
commit c939c8a9ff
16 changed files with 346 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ import org.springframework.data.redis.connection.RedisZSetCommands.Tuple;
import org.springframework.data.redis.connection.SortParameters.Order;
import org.springframework.data.redis.connection.StringRedisConnection.StringTuple;
import org.springframework.data.redis.core.Cursor;
import org.springframework.data.redis.core.ScanOptions;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.types.RedisClientInfo;
import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
@@ -1950,6 +1951,41 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(i, is(itemCount));
}
/**
* @see DATAREDIS-306
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void zScanShouldReadEntireValueRange() {
if (!ConnectionUtils.isJedis(connectionFactory) && !ConnectionUtils.isLettuce(connectionFactory)) {
throw new AssumptionViolatedException("ZSCAN is only available for jedis and lettuce");
}
if (connection.isPipelined() || connection.isQueueing()) {
throw new AssumptionViolatedException("ZSCAN is only available in non pipeline | queue mode.");
}
connection.zAdd("myset", 2, "Bob");
connection.zAdd("myset", 1, "James");
connection.zAdd("myset", 4, "Joe");
Cursor<StringTuple> tuples = connection.zScan("myset", ScanOptions.NONE);
int count = 0;
while (tuples.hasNext()) {
StringTuple tuple = tuples.next();
assertThat(tuple.getValueAsString(), anyOf(equalTo("Bob"), equalTo("James"), equalTo("Joe")));
assertThat(tuple.getScore(), anyOf(equalTo(1D), equalTo(2D), equalTo(4D)));
count++;
}
assertThat(count, equalTo(3));
}
/**
* @see DATAREDIS-304
*/

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

@@ -15,16 +15,18 @@
*/
package org.springframework.data.redis.core;
import static org.hamcrest.core.AnyOf.*;
import static org.hamcrest.core.IsEqual.*;
import static org.junit.Assert.*;
import static org.springframework.data.redis.matcher.RedisTestMatchers.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
import org.hamcrest.core.IsEqual;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,6 +36,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.springframework.data.redis.ObjectFactory;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
import org.springframework.test.annotation.IfProfileValue;
/**
* Integration test of {@link DefaultZSetOperations}
@@ -207,7 +210,7 @@ public class DefaultZSetOperationsTests<K, V> {
values.add(new DefaultTypedTuple<V>(value3, 0.8));
zSetOps.add(key, values);
assertThat(zSetOps.zCard(key), IsEqual.equalTo(3L));
assertThat(zSetOps.zCard(key), equalTo(3L));
}
@Test
@@ -224,6 +227,39 @@ public class DefaultZSetOperationsTests<K, V> {
values.add(new DefaultTypedTuple<V>(value3, 0.8));
zSetOps.add(key, values);
assertThat(zSetOps.size(key), IsEqual.equalTo(3L));
assertThat(zSetOps.size(key), equalTo(3L));
}
/**
* @see DATAREDIS-306
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void testZScanShouldReadEntireValueRange() {
K key = keyFactory.instance();
final TypedTuple<V> tuple1 = new DefaultTypedTuple<V>(valueFactory.instance(), 1.7);
final TypedTuple<V> tuple2 = new DefaultTypedTuple<V>(valueFactory.instance(), 3.2);
final TypedTuple<V> tuple3 = new DefaultTypedTuple<V>(valueFactory.instance(), 0.8);
Set<TypedTuple<V>> values = new HashSet<TypedTuple<V>>() {
{
add(tuple1);
add(tuple2);
add(tuple3);
}
};
zSetOps.add(key, values);
int count = 0;
Iterator<TypedTuple<V>> it = zSetOps.scan(key, ScanOptions.scanOptions().count(2).build());
while (it.hasNext()) {
assertThat(it.next(), anyOf(equalTo(tuple1), equalTo(tuple2), equalTo(tuple3)));
count++;
}
assertThat(count, equalTo(3));
}
}