Skip to content

Commit 73c8ce2

Browse files
argszeromp911de
authored andcommitted
DATAREDIS-500 - Use Hash Key and Hash Value serializers in RedisTemplate executePipelined(…).
RedisTemplate executePipelined(RedisCallback) uses now the Hash Key and Hash Value serializers to deserialize the response. Original pull request: #190. CLA: 174020160421053943 (Anqing Shao).
1 parent 31d8ab2 commit 73c8ce2

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/main/java/org/springframework/data/redis/core/RedisTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public List<Object> doInRedis(RedisConnection connection) throws DataAccessExcep
286286
}
287287
List<Object> closePipeline = connection.closePipeline();
288288
pipelinedClosed = true;
289-
return deserializeMixedResults(closePipeline, resultSerializer, resultSerializer, resultSerializer);
289+
return deserializeMixedResults(closePipeline, resultSerializer, hashKeySerializer, hashValueSerializer);
290290
} finally {
291291
if (!pipelinedClosed) {
292292
connection.closePipeline();

src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.springframework.data.redis.connection.DataType;
5252
import org.springframework.data.redis.connection.RedisConnection;
5353
import org.springframework.data.redis.connection.StringRedisConnection;
54+
import org.springframework.data.redis.connection.jedis.JedisClusterConnection;
5455
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
5556
import org.springframework.data.redis.connection.jredis.JredisConnectionFactory;
5657
import org.springframework.data.redis.connection.srp.SrpConnectionFactory;
@@ -314,6 +315,22 @@ public Object doInRedis(RedisConnection connection) throws DataAccessException {
314315
assertEquals(Arrays.asList(new Object[] { 5l, 1l, 2l, Arrays.asList(new Long[] { 10l, 11l }) }), results);
315316
}
316317

318+
@Test
319+
public void testExecutePipelinedWidthDifferentHashKeySerializerAndHashValueSerializer() {
320+
assumeTrue(redisTemplate instanceof StringRedisTemplate);
321+
redisTemplate.setKeySerializer(new StringRedisSerializer());
322+
redisTemplate.setHashKeySerializer(new StringRedisSerializer());
323+
redisTemplate.setHashValueSerializer(new GenericToStringSerializer<Long>(Long.class));
324+
redisTemplate.opsForHash().put((K) "foo", "key", 1L);
325+
List<Object> results = redisTemplate.executePipelined(new RedisCallback() {
326+
public Object doInRedis(RedisConnection connection) throws DataAccessException {
327+
connection.hGetAll(((StringRedisSerializer) redisTemplate.getKeySerializer()).serialize("foo"));
328+
return null;
329+
}
330+
});
331+
assertEquals(((Map) results.get(0)).get("key"), 1L);
332+
}
333+
317334
@Test(expected = InvalidDataAccessApiUsageException.class)
318335
public void testExecutePipelinedNonNullRedisCallback() {
319336
redisTemplate.executePipelined(new RedisCallback<String>() {

0 commit comments

Comments
 (0)