From 7173be2c287ec8150e10958d9c52ce1592f43e22 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 24 Jun 2013 16:39:45 -0700 Subject: [PATCH] Add Redis 2.6 srandmember with count to SetOperations DATAREDIS-116 --- .../data/redis/core/BoundSetOperations.java | 2 + .../redis/core/DefaultBoundSetOperations.java | 7 +- .../data/redis/core/DefaultSetOperations.java | 12 ++++ .../data/redis/core/SetOperations.java | 2 + .../redis/core/DefaultSetOperationsTests.java | 66 +++++++++++++++++++ 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java diff --git a/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java b/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java index e6f90b162..378b4b85c 100644 --- a/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java @@ -62,6 +62,8 @@ public interface BoundSetOperations extends BoundKeyOperations { V randomMember(); + Set randomMembers(long count); + Boolean remove(Object o); V pop(); diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java index 4fa890108..65a211098 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java @@ -113,12 +113,17 @@ class DefaultBoundSetOperations extends DefaultBoundKeyOperations imple return ops.randomMember(getKey()); } + + public Set randomMembers(long count) { + return ops.randomMembers(getKey(), count); + } + public Boolean remove(Object o) { return ops.remove(getKey(), o); } - + public V pop() { return ops.pop(getKey()); } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java index 7c4a822f6..71466999b 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java @@ -162,6 +162,18 @@ class DefaultSetOperations extends AbstractOperations implements Set }, true); } + + public Set randomMembers(K key, final long count) { + final byte[] rawKey = rawKey(key); + Set rawValues = execute(new RedisCallback>() { + public Set doInRedis(RedisConnection connection) { + return connection.sRandMember(rawKey, count); + } + }, true); + + return deserializeValues(rawValues); + } + public Boolean remove(K key, Object o) { final byte[] rawKey = rawKey(key); diff --git a/src/main/java/org/springframework/data/redis/core/SetOperations.java b/src/main/java/org/springframework/data/redis/core/SetOperations.java index 13e0ff3e0..8f02eeed6 100644 --- a/src/main/java/org/springframework/data/redis/core/SetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/SetOperations.java @@ -60,6 +60,8 @@ public interface SetOperations { V randomMember(K key); + Set randomMembers(K key, long count); + Boolean remove(K key, Object o); V pop(K key); diff --git a/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java new file mode 100644 index 000000000..a4c9ae3f4 --- /dev/null +++ b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java @@ -0,0 +1,66 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.redis.core; + +import java.util.Arrays; +import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.IfProfileValue; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * Integration test of {@link DefaultSetOperations} + * + * @author Jennifer Hickey + * + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration("RedisTemplateTests-context.xml") +public class DefaultSetOperationsTests { + + @Autowired + private RedisTemplate redisTemplate; + + private SetOperations setOps; + + @Before + public void setUp() { + setOps = redisTemplate.opsForSet(); + } + + @After + public void tearDown() { + redisTemplate.getConnectionFactory().getConnection().flushDb(); + } + + @Test + @IfProfileValue(name = "redisVersion", value = "2.6") + public void testRandomMembers() { + setOps.add("test", "foo"); + setOps.add("test", "bar"); + setOps.add("test", "baz"); + Set members = setOps.randomMembers("test", 2); + assertEquals(2, members.size()); + assertTrue(Arrays.asList(new String[] {"foo", "bar", "baz"}).containsAll(members)); + } +}