From dd1bcc3941a72bf8f6e39a288f1927166c912a26 Mon Sep 17 00:00:00 2001 From: icedrake Date: Wed, 2 Apr 2014 16:58:29 -0600 Subject: [PATCH] DATAREDIS-293 - allow bulk add elements with the same score this is supported now in jedis 2.4 --- .../data/redis/connection/jedis/JedisConnection.java | 4 ---- .../connection/jedis/JedisConnectionIntegrationTests.java | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java index a69f0daeb2..585336eb26 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java @@ -2923,10 +2923,6 @@ private Map zAddArgs(Set tuples) { Map args = new HashMap(); for (Tuple tuple : tuples) { - if (args.containsValue(tuple.getScore())) { - throw new UnsupportedOperationException( - "Bulk add of multiple elements with the same score is not supported. Add the elements individually."); - } args.put(tuple.getValue(), tuple.getScore()); } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java index 026a9a6d82..81971162fc 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -117,12 +117,13 @@ public void testClosePool() { factory2.destroy(); } - @Test(expected = UnsupportedOperationException.class) + @Test public void testZAddSameScores() { Set strTuples = new HashSet(); strTuples.add(new DefaultStringTuple("Bob".getBytes(), "Bob", 2.0)); strTuples.add(new DefaultStringTuple("James".getBytes(), "James", 2.0)); - connection.zAdd("myset", strTuples); + Long added = connection.zAdd("myset", strTuples); + assertEquals(2L, added.longValue()); } @Test(expected = InvalidDataAccessApiUsageException.class)