From 63a79a4ebbec3bbf010de98644e686232a6fdb64 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 1 Apr 2013 10:32:12 -0700 Subject: [PATCH] Fix SRP zCount/zInterStore methods executing synchronously when pipelining DATAREDIS-142 --- .../data/redis/connection/srp/SrpConnection.java | 4 ++-- .../srp/SrpConnectionPipelineIntegrationTests.java | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java index 20d6b91c7..86a112486 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java @@ -1354,7 +1354,7 @@ public class SrpConnection implements RedisConnection { public Long zCount(byte[] key, double min, double max) { try { - if (isQueueing()) { + if (isPipelined()) { pipeline(pipeline.zcount(key, min, max)); return null; } @@ -1395,7 +1395,7 @@ public class SrpConnection implements RedisConnection { } try { - if (isQueueing()) { + if (isPipelined()) { pipeline(pipeline.zinterstore(args)); return null; } diff --git a/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionPipelineIntegrationTests.java index d1907b45a..6944e86f0 100644 --- a/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionPipelineIntegrationTests.java @@ -82,14 +82,6 @@ public class SrpConnectionPipelineIntegrationTests extends public void testGetConfig() { } - @Ignore("DATAREDIS-142 SRP zCount/zInterStore methods execute synchronously when pipelining") - public void testZCount() { - } - - @Ignore("DATAREDIS-142 SRP zCount/zInterStore methods execute synchronously when pipelining") - public void testZInterStore() { - } - @Ignore("DATAREDIS-152 Syntax error on zRangeByScore and and zRangeByScoreWithScores when using offset and count") public void testZRangeByScoreOffsetCount() { }