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

DATAREDIS-746 - Polishing.

Browse Source 
Add since tags. Add imports for nested RedisZSetCommands types. Simplify tests.

Original pull request: #300 superseded by #314.
This commit is contained in:
Mark Paluch
2018-02-15 14:31:40 +01:00
committed by Christoph Strobl
parent 3bc1f3368b
commit 7d6524bace
3 changed files with 33 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ package org.springframework.data.redis.core;
import java.util.Collection;
import java.util.Set;
import org.springframework.data.redis.connection.RedisZSetCommands;
import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate;
import org.springframework.data.redis.connection.RedisZSetCommands.Limit;
import org.springframework.data.redis.connection.RedisZSetCommands.Range;
import org.springframework.data.redis.connection.RedisZSetCommands.Tuple;
@@ -31,7 +31,7 @@ import org.springframework.lang.Nullable;
* @author Costin Leau
* @author Christoph Strobl
* @author Mark Paluch
* @author wongoo
* @author Wongoo
*/
public interface BoundZSetOperations<K, V> extends BoundKeyOperations<K> {
@@ -269,9 +269,10 @@ public interface BoundZSetOperations<K, V> extends BoundKeyOperations<K> {
* @param otherKeys must not be {@literal null}.
* @param destKey must not be {@literal null}.
* @param aggregate must not be {@literal null}.
* @since 2.1
* @see <a href="http://redis.io/commands/zunionstore">Redis Documentation: ZUNIONSTORE</a>
*/
void unionAndStore(Collection<K> otherKeys, K destKey, RedisZSetCommands.Aggregate aggregate);
void unionAndStore(Collection<K> otherKeys, K destKey, Aggregate aggregate);
/**
* Union sorted sets at the bound key and {@code otherKeys} and store result in destination {@code destKey}.
@@ -280,9 +281,10 @@ public interface BoundZSetOperations<K, V> extends BoundKeyOperations<K> {
* @param weights must not be {@literal null}.
* @param destKey must not be {@literal null}.
* @param aggregate must not be {@literal null}.
* @since 2.1
* @see <a href="http://redis.io/commands/zunionstore">Redis Documentation: ZUNIONSTORE</a>
*/
void unionAndStore(Collection<K> otherKeys, int[] weights, K destKey, RedisZSetCommands.Aggregate aggregate);
void unionAndStore(Collection<K> otherKeys, int[] weights, K destKey, Aggregate aggregate);
/**
* Intersect sorted sets at the bound key and {@code otherKey} and store result in destination {@code destKey}.

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

@@ -18,7 +18,7 @@ package org.springframework.data.redis.core;
import java.util.Collection;
import java.util.Set;
import org.springframework.data.redis.connection.RedisZSetCommands;
import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate;
import org.springframework.data.redis.connection.RedisZSetCommands.Limit;
import org.springframework.data.redis.connection.RedisZSetCommands.Range;
import org.springframework.data.redis.connection.RedisZSetCommands.Tuple;
@@ -373,10 +373,11 @@ public interface ZSetOperations<K, V> {
* @param destKey must not be {@literal null}.
* @param aggregate must not be {@literal null}.
* @return {@literal null} when used in pipeline / transaction.
* @since 2.1
* @see <a href="http://redis.io/commands/zunionstore">Redis Documentation: ZUNIONSTORE</a>
*/
@Nullable
Long unionAndStore(K key, Collection<K> otherKeys, K destKey, RedisZSetCommands.Aggregate aggregate);
Long unionAndStore(K key, Collection<K> otherKeys, K destKey, Aggregate aggregate);
/**
* Union sorted sets at {@code key} and {@code otherKeys} and store result in destination {@code destKey}.
@@ -387,10 +388,11 @@ public interface ZSetOperations<K, V> {
* @param destKey must not be {@literal null}.
* @param aggregate must not be {@literal null}.
* @return {@literal null} when used in pipeline / transaction.
* @since 2.1
* @see <a href="http://redis.io/commands/zunionstore">Redis Documentation: ZUNIONSTORE</a>
*/
@Nullable
Long unionAndStore(K key, Collection<K> otherKeys, int[] weights, K destKey, RedisZSetCommands.Aggregate aggregate);
Long unionAndStore(K key, Collection<K> otherKeys, int[] weights, K destKey, Aggregate aggregate);
/**
* Intersect sorted sets at {@code key} and {@code otherKey} and store result in destination {@code destKey}.

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

@@ -15,20 +15,16 @@
*/
package org.springframework.data.redis.core;
import static org.hamcrest.core.AnyOf.*;
import static org.hamcrest.core.IsEqual.*;
import static org.hamcrest.core.IsInstanceOf.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.junit.Assume.*;
import static org.springframework.data.redis.matcher.RedisTestMatchers.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.junit.After;
@@ -39,7 +35,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.springframework.data.redis.ConnectionFactoryTracker;
import org.springframework.data.redis.DoubleAsStringObjectFactory;
import org.springframework.data.redis.DoubleObjectFactory;
@@ -370,58 +365,39 @@ public class DefaultZSetOperationsTests<K, V> {
assertThat(count, equalTo(3));
}
@Test //DATAREDIS-746
@Test // DATAREDIS-746
public void testZsetUnionWithAggregate() {
K key1 = keyFactory.instance();
K key2 = keyFactory.instance();
V value1 = valueFactory.instance();
V value2 = valueFactory.instance();
V value3 = valueFactory.instance();
V value4 = valueFactory.instance();
Set<TypedTuple<V>> values1 = new HashSet<>();
values1.add(new DefaultTypedTuple<>(value1, 1.0));
values1.add(new DefaultTypedTuple<>(value2, 2.0));
zSetOps.add(key1, values1);
zSetOps.add(key1, value1, 1.0);
zSetOps.add(key1, value2, 2.0);
zSetOps.add(key2, value2, 3.0);
Set<TypedTuple<V>> values2 = new HashSet<>();
values2.add(new DefaultTypedTuple<>(value3, 3.0));
zSetOps.add(key2, values2);
// union values
assertThat(zSetOps.count(key1, 0, 99), equalTo(2L));
List<K> otherKeys = Arrays.asList(key2);
zSetOps.unionAndStore(key1, otherKeys, key1, RedisZSetCommands.Aggregate.MIN);
assertThat(zSetOps.count(key1, 0, 99), equalTo(3L));
assertThat(zSetOps.score(key1, value3), equalTo(3.0));
zSetOps.unionAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MIN);
// aggregate in MAX
K key3 = keyFactory.instance();
Set<TypedTuple<V>> values3 = new HashSet<>();
values3.add(new DefaultTypedTuple<>(value4, 4.0));
values3.add(new DefaultTypedTuple<>(value2, 20.0));
zSetOps.add(key3, values3);
List<K> otherKeys3 = Arrays.asList(key3);
zSetOps.unionAndStore(key1, otherKeys3, key1, RedisZSetCommands.Aggregate.MAX);
assertThat(zSetOps.count(key1, 0, 99), equalTo(4L));
assertThat(zSetOps.score(key1, value4), equalTo(4.0));
assertThat(zSetOps.score(key1, value2), equalTo(20.0));
assertThat(zSetOps.score(key1, value2), closeTo(2.0, 0.1));
}
// aggregate in MIN with weight
K key4 = keyFactory.instance();
Set<TypedTuple<V>> values1_1 = new HashSet<>();
values1_1.add(new DefaultTypedTuple<>(value1, 4.0));
zSetOps.add(key4, values1_1);
List<K> otherKeys4 = Arrays.asList(key4);
int weight[] = {2, 1};
zSetOps.unionAndStore(key1, otherKeys4, weight, key1, RedisZSetCommands.Aggregate.MIN);
assertThat(zSetOps.count(key1, 0, 99), equalTo(4L));
assertThat(zSetOps.score(key1, value1), equalTo(2.0));
@Test // DATAREDIS-746
public void testZsetUnionWithAggregateWeights() {
int weight2[] = {5, 1};
zSetOps.unionAndStore(key1, otherKeys4, weight2, key1, RedisZSetCommands.Aggregate.MIN);
assertThat(zSetOps.score(key1, value1), equalTo(4.0));
K key1 = keyFactory.instance();
K key2 = keyFactory.instance();
V value1 = valueFactory.instance();
zSetOps.add(key1, value1, 4.0);
zSetOps.add(key2, value1, 3.0);
int weight[] = { 1, 2 };
zSetOps.unionAndStore(key1, Collections.singletonList(key2), weight, key1, RedisZSetCommands.Aggregate.MAX);
assertThat(zSetOps.score(key1, value1), closeTo(6.0, 0.1));
}
}