Commit 8ed4703

christian-sahlmannmp911de

authored and

committed

DATAREDIS-803 - Retrieve DefaultRedisMap.entrySet() via HGETALL.

Redis has a limitation of 1024 * 1024 parameters]() for bulk operations. To receive more than 1024 * 1024 - 1 entries with entrySet(), we can directly use the HGETALL command instead of first fetching the keys with HKEYS and then fetching the values with HMGET. See also: https://github.com/antirez/redis/blob/4.0.9/src/networking.c#L1200 Original pull request: #326.

1 parent cd34044 commit 8ed4703Copy full SHA for 8ed4703

File tree

2 files changed

+27

-13

lines changed

src
- main/java/org/springframework/data/redis/support/collections
  - DefaultRedisMap.java
- test/java/org/springframework/data/redis/support/collections
  - AbstractRedisMapTests.java

2 files changed

+27

-13

lines changed

`‎src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java‎`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`* @author Costin Leau`
`40`	`40`	`* @author Christoph Strobl`
	`41`	`+ * @author Christian Bühler`
`41`	`42`	`*/`
`42`	`43`	`public class DefaultRedisMap<K, V> implements RedisMap<K, V> {`
`43`	`44`
`@@ -156,19 +157,9 @@ public boolean containsValue(Object value) {`
`156`	`157`	`@Override`
`157`	`158`	`public Set<java.util.Map.Entry<K, V>> entrySet() {`
`158`	`159`
`159`		`- Set<K> keySet = keySet();`
`160`		`- checkResult(keySet);`
`161`		`- Collection<V> multiGet = hashOps.multiGet(keySet);`
`162`		`-`
`163`		`- Iterator<K> keys = keySet.iterator();`
`164`		`- Iterator<V> values = multiGet.iterator();`
`165`		`-`
`166`		`- Set<Map.Entry<K, V>> entries = new LinkedHashSet<>();`
`167`		`- while (keys.hasNext()) {`
`168`		`- entries.add(new DefaultRedisMapEntry(keys.next(), values.next()));`
`169`		`- }`
`170`		`-`
`171`		`- return entries;`
	`160`	`+ Map<K, V> entries = hashOps.entries();`
	`161`	`+ checkResult(entries);`
	`162`	`+ return entries.entrySet();`
`172`	`163`	`}`
`173`	`164`
`174`	`165`	`/*`

`‎src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java‎`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import java.util.ArrayList;`
`26`	`26`	`import java.util.Collection;`
`27`	`27`	`import java.util.Collections;`
	`28`	`+import java.util.HashMap;`
`28`	`29`	`import java.util.LinkedHashMap;`
`29`	`30`	`import java.util.LinkedHashSet;`
`30`	`31`	`import java.util.Map;`
`@@ -62,6 +63,7 @@`
`62`	`63`	`* @author Jennifer Hickey`
`63`	`64`	`* @author Christoph Strobl`
`64`	`65`	`* @author Thomas Darimont`
	`66`	`+ * @author Christian Bühler`
`65`	`67`	`*/`
`66`	`68`	`@RunWith(Parameterized.class)`
`67`	`69`	`public abstract class AbstractRedisMapTests<K, V> {`
`@@ -396,6 +398,27 @@ public void testEntrySet() {`
`396`	`398`	`assertThat(values, not(hasItem(v2)));`
`397`	`399`	`}`
`398`	`400`
	`401`	`+ @Test // DATAREDIS-803`
	`402`	`+ @IfProfileValue(name = "runLongTests", value = "true")`
	`403`	`+ public void testBigEntrySet() {`
	`404`	`+`
	`405`	`+ Set<Entry<K, V>> entries = map.entrySet();`
	`406`	`+ assertTrue(entries.isEmpty());`
	`407`	`+`
	`408`	`+ for (int j = 0; j < 2; j++) {`
	`409`	`+ Map<K, V> m = new HashMap<>();`
	`410`	`+ for (int i = 0; i < 1024 * 1024 / 2 - 1; i++) {`
	`411`	`+ m.put(getKey(), getValue());`
	`412`	`+ }`
	`413`	`+ map.putAll(m);`
	`414`	`+ }`
	`415`	`+ map.put(getKey(), getValue());`
	`416`	`+`
	`417`	`+ entries = map.entrySet();`
	`418`	`+`
	`419`	`+ assertEquals(1024 * 1024 - 1, entries.size());`
	`420`	`+ }`
	`421`	`+`
`399`	`422`	`@Test`
`400`	`423`	`public void testPutIfAbsent() {`
`401`	`424`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8ed4703

File tree

2 files changed

2 files changed

`‎src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java‎`

`‎src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java‎`

0 commit comments