Skip to content

Remove WATCH from Transaction #2033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 6, 2021
Merged

Remove WATCH from Transaction #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dbbd98
Remove WATCH from Transaction
sazzad16 Jul 22, 2019
034716f
Add UNWATCH in pipeline interfaces
sazzad16 Oct 28, 2019
60ccce4
Merge branch 'master' into watch-in-multi
sazzad16 Dec 29, 2020
d237e32
Merge branch 'master' into watch-in-multi
sazzad16 Jan 12, 2021
813c74c
Merge branch 'master' into watch-in-multi
sazzad16 Jan 30, 2021
d920eb4
Merge branch 'master' into watch-in-multi
sazzad16 Mar 31, 2021
4dab6f1
Remove watch and unwatch from Transaction
sazzad16 Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,18 +411,6 @@ public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
return getResponse(BuilderFactory.LONG);
}

@Override
public Response<String> watch(String... keys) {
client.watch(keys);
return getResponse(BuilderFactory.STRING);
}

@Override
public Response<String> watch(byte[]... keys) {
client.watch(keys);
return getResponse(BuilderFactory.STRING);
}

@Override
public Response<String> unwatch() {
client.unwatch();
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/redis/clients/jedis/Pipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,14 @@ public void close() {
clear();
}

public Response<String> watch(String... keys) {
client.watch(keys);
return getResponse(BuilderFactory.STRING);
}

public Response<String> watch(byte[]... keys) {
client.watch(keys);
return getResponse(BuilderFactory.STRING);
}

}
26 changes: 0 additions & 26 deletions src/main/java/redis/clients/jedis/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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<String> watch(byte[]... keys) throws UnsupportedOperationException {
throw new UnsupportedOperationException(WATCH_INSIDE_MULTI_MESSAGE);
}
}
2 changes: 0 additions & 2 deletions src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ public interface MultiKeyBinaryRedisPipeline {

Response<Long> sunionstore(byte[] dstkey, byte[]... keys);

Response<String> watch(byte[]... keys);

Response<String> unwatch();

Response<Set<byte[]>> zdiff(byte[]... keys);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ Response<String> blmove(String srcKey, String dstKey, ListDirection from, ListDi

Response<Long> sunionstore(String dstkey, String... keys);

Response<String> watch(String... keys);

Response<String> unwatch();

Response<Set<String>> zdiff(String... keys);
Expand Down