From 5dbbd9803a6f2d6fb2192702b8a356757372af28 Mon Sep 17 00:00:00 2001 From: sazzad16 Date: Mon, 22 Jul 2019 11:36:20 +0600 Subject: [PATCH 1/3] Remove WATCH from Transaction Redis doesn't support WATCH within MULTI --- .../clients/jedis/MultiKeyPipelineBase.java | 18 ------------------ .../java/redis/clients/jedis/Pipeline.java | 15 +++++++++++++++ .../java/redis/clients/jedis/Transaction.java | 5 +++++ .../commands/MultiKeyBinaryRedisPipeline.java | 4 ---- .../commands/MultiKeyCommandsPipeline.java | 4 ---- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java index c0bc5bc12b..64d8fe1177 100644 --- a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java +++ b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java @@ -295,24 +295,6 @@ public Response sunionstore(byte[] dstkey, byte[]... keys) { return getResponse(BuilderFactory.LONG); } - @Override - public Response watch(String... keys) { - client.watch(keys); - return getResponse(BuilderFactory.STRING); - } - - @Override - public Response watch(byte[]... keys) { - client.watch(keys); - return getResponse(BuilderFactory.STRING); - } - - @Override - public Response unwatch() { - client.unwatch(); - return getResponse(BuilderFactory.STRING); - } - @Override public Response zinterstore(String dstkey, String... sets) { client.zinterstore(dstkey, sets); diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java index 2c347a967d..cef375af1e 100644 --- a/src/main/java/redis/clients/jedis/Pipeline.java +++ b/src/main/java/redis/clients/jedis/Pipeline.java @@ -157,4 +157,19 @@ public void close() { clear(); } + public Response watch(String... keys) { + client.watch(keys); + return getResponse(BuilderFactory.STRING); + } + + public Response watch(byte[]... keys) { + client.watch(keys); + return getResponse(BuilderFactory.STRING); + } + + public Response unwatch() { + client.unwatch(); + return getResponse(BuilderFactory.STRING); + } + } diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index 726c9357d2..b786bd78b3 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -91,4 +91,9 @@ public void setClient(Client client) { public void close() { clear(); } + + public Response unwatch() { + client.unwatch(); + return getResponse(BuilderFactory.STRING); + } } \ No newline at end of file diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java index 981e8d27f1..efe835e6fb 100644 --- a/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java @@ -56,10 +56,6 @@ public interface MultiKeyBinaryRedisPipeline { Response sunionstore(byte[] dstkey, byte[]... keys); - Response watch(byte[]... keys); - - Response unwatch(); - Response zinterstore(byte[] dstkey, byte[]... sets); Response zinterstore(byte[] dstkey, ZParams params, byte[]... sets); diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java index b2f22d35f1..704b1093c4 100644 --- a/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java @@ -55,10 +55,6 @@ public interface MultiKeyCommandsPipeline { Response sunionstore(String dstkey, String... keys); - Response watch(String... keys); - - Response unwatch(); - Response zinterstore(String dstkey, String... sets); Response zinterstore(String dstkey, ZParams params, String... sets); From 034716f66a92e34f80a987c9c8af356c40c69e31 Mon Sep 17 00:00:00 2001 From: sazzad16 Date: Mon, 28 Oct 2019 18:36:05 +0600 Subject: [PATCH 2/3] Add UNWATCH in pipeline interfaces --- src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java | 6 ++++++ src/main/java/redis/clients/jedis/Pipeline.java | 5 ----- src/main/java/redis/clients/jedis/Transaction.java | 5 ----- .../clients/jedis/commands/MultiKeyBinaryRedisPipeline.java | 2 ++ .../clients/jedis/commands/MultiKeyCommandsPipeline.java | 2 ++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java index 64d8fe1177..3a1b5c968e 100644 --- a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java +++ b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java @@ -295,6 +295,12 @@ public Response sunionstore(byte[] dstkey, byte[]... keys) { return getResponse(BuilderFactory.LONG); } + @Override + public Response unwatch() { + client.unwatch(); + return getResponse(BuilderFactory.STRING); + } + @Override public Response zinterstore(String dstkey, String... sets) { client.zinterstore(dstkey, sets); diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java index cef375af1e..b38a7c1943 100644 --- a/src/main/java/redis/clients/jedis/Pipeline.java +++ b/src/main/java/redis/clients/jedis/Pipeline.java @@ -167,9 +167,4 @@ public Response watch(byte[]... keys) { return getResponse(BuilderFactory.STRING); } - public Response unwatch() { - client.unwatch(); - return getResponse(BuilderFactory.STRING); - } - } diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index b786bd78b3..726c9357d2 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -91,9 +91,4 @@ public void setClient(Client client) { public void close() { clear(); } - - public Response unwatch() { - client.unwatch(); - return getResponse(BuilderFactory.STRING); - } } \ No newline at end of file diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java index efe835e6fb..6daf32830b 100644 --- a/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java @@ -56,6 +56,8 @@ public interface MultiKeyBinaryRedisPipeline { Response sunionstore(byte[] dstkey, byte[]... keys); + Response unwatch(); + Response zinterstore(byte[] dstkey, byte[]... sets); Response zinterstore(byte[] dstkey, ZParams params, byte[]... sets); diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java index 704b1093c4..6f1733f889 100644 --- a/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java @@ -55,6 +55,8 @@ public interface MultiKeyCommandsPipeline { Response sunionstore(String dstkey, String... keys); + Response unwatch(); + Response zinterstore(String dstkey, String... sets); Response zinterstore(String dstkey, ZParams params, String... sets); From 4dab6f1c7fd16d73973416727161c8394956da69 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Wed, 31 Mar 2021 20:47:00 +0600 Subject: [PATCH 3/3] Remove watch and unwatch from Transaction --- .../java/redis/clients/jedis/Transaction.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index de2800e9f2..f2b09b702d 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -91,30 +91,4 @@ public void setClient(Client client) { public void close() { clear(); } - - private static final String WATCH_INSIDE_MULTI_MESSAGE = "WATCH inside MULTI is not allowed"; - - /** - * @param keys - * @return - * @throws UnsupportedOperationException - * @deprecated {@value #WATCH_INSIDE_MULTI_MESSAGE} - */ - @Override - @Deprecated - public Response watch(String... keys) throws UnsupportedOperationException { - throw new UnsupportedOperationException(WATCH_INSIDE_MULTI_MESSAGE); - } - - /** - * @param keys - * @return - * @throws UnsupportedOperationException - * @deprecated {@value #WATCH_INSIDE_MULTI_MESSAGE} - */ - @Override - @Deprecated - public Response watch(byte[]... keys) throws UnsupportedOperationException { - throw new UnsupportedOperationException(WATCH_INSIDE_MULTI_MESSAGE); - } }