Skip to content

DATAREDIS-564 - Delegate expire(…) to pExpire if timeout exceeds Integer.MAX_VALUE. #228

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

Closed
wants to merge 2 commits into from
Closed

DATAREDIS-564 - Delegate expire(…) to pExpire if timeout exceeds Integer.MAX_VALUE. #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb7188
DATAREDIS-564 - Invoking JedisConnection.expire during transaction/pi…
mp911de Oct 24, 2016
8bad39e
DATAREDIS-564 - Delegate expire(…) to pExpire if timeout exceeds Inte…
mp911de Oct 24, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>1.8.0.BUILD-SNAPSHOT</version>
<version>1.8.0.DATAREDIS-564-SNAPSHOT</version>

<name>Spring Data Redis</name>

Expand Down
19 changes: 11 additions & 8 deletions src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,15 +801,10 @@ public Boolean exists(byte[] key) {

public Boolean expire(byte[] key, long seconds) {

/*
* @see DATAREDIS-286 to avoid overflow in Jedis
*
* TODO Remove this workaround when we upgrade to a Jedis version that contains a
* fix for: https://github.com/xetorthio/jedis/pull/575
*/
if (seconds > Integer.MAX_VALUE) {
Assert.notNull(key, "Key must not be null!");

return pExpireAt(key, time() + TimeUnit.SECONDS.toMillis(seconds));
if (seconds > Integer.MAX_VALUE) {
return pExpire(key, TimeUnit.SECONDS.toMillis(seconds));
}

try {
Expand All @@ -828,6 +823,9 @@ public Boolean expire(byte[] key, long seconds) {
}

public Boolean expireAt(byte[] key, long unixTime) {

Assert.notNull(key, "Key must not be null!");

try {
if (isPipelined()) {
pipeline(new JedisResult(pipeline.expireAt(key, unixTime), JedisConverters.longToBoolean()));
Expand Down Expand Up @@ -1021,6 +1019,8 @@ public Long ttl(byte[] key, TimeUnit timeUnit) {
}

public Boolean pExpire(byte[] key, long millis) {

Assert.notNull(key, "Key must not be null!");

try {
if (isPipelined()) {
Expand All @@ -1038,6 +1038,9 @@ public Boolean pExpire(byte[] key, long millis) {
}

public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {

Assert.notNull(key, "Key must not be null!");

try {
if (isPipelined()) {
pipeline(new JedisResult(pipeline.pexpireAt(key, unixTimeInMillis), JedisConverters.longToBoolean()));
Expand Down