github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TTL value checking

Browse Source
pull/365/head
Nikita 9 years ago
parent a766513874
commit d3b2cb3213
3 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File

32
src/main/java/org/redisson/RedissonSetCache.java
Unescape Escape View File

@ -69,7 +69,6 @@ import net.openhft.hashing.LongHashFunction;
public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<V> {
private static final RedisCommand<Void> ADD_ALL = new RedisCommand<Void>("HMSET", new VoidReplayConvertor());
private static final RedisCommand<Boolean> EVAL_ADD = new RedisCommand<Boolean>("EVAL", new BooleanReplayConvertor(), 5);
private static final RedisCommand<List<Object>> EVAL_CONTAINS_KEY = new RedisCommand<List<Object>>("EVAL", new ObjectListReplayDecoder<Object>());
private static final RedisStrictCommand<Boolean> HDEL = new RedisStrictCommand<Boolean>("HDEL", new BooleanReplayConvertor());
@ -140,16 +139,16 @@ public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<
byte[] key = hash(o);
Future<List<Object>> future = commandExecutor.evalReadAsync(getName(), codec, EVAL_CONTAINS_KEY,
"local value = redis.call('hexists', KEYS[1], KEYS[3]); " +
"local value = redis.call('hexists', KEYS[1], ARGV[1]); " +
"local expireDate = 92233720368547758; " +
"if value == 1 then " +
"local expireDateScore = redis.call('zscore', KEYS[2], KEYS[3]); "
"local expireDateScore = redis.call('zscore', KEYS[2], ARGV[1]); "
+ "if expireDateScore ~= false then "
+ "expireDate = tonumber(expireDateScore) "
+ "end; " +
"end;" +
"return {expireDate, value}; ",
Arrays.<Object>asList(getName(), getTimeoutSetName(), key));
Arrays.<Object>asList(getName(), getTimeoutSetName()), key);
addExpireListener(result, future, new BooleanReplayConvertor(), false);
@ -347,13 +346,13 @@ public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<
long timeoutDate = System.currentTimeMillis() + unit.toMillis(ttl);
return commandExecutor.evalWriteAsync(getName(), codec, RedisCommands.EVAL_BOOLEAN,
"redis.call('zadd', KEYS[2], ARGV[1], KEYS[3]); " +
"if redis.call('hexists', KEYS[1], KEYS[3]) == 0 then " +
"redis.call('hset', KEYS[1], KEYS[3], ARGV[2]); " +
"redis.call('zadd', KEYS[2], ARGV[1], ARGV[3]); " +
"if redis.call('hexists', KEYS[1], ARGV[3]) == 0 then " +
"redis.call('hset', KEYS[1], ARGV[3], ARGV[2]); " +
"return 1; " +
"end;" +
"return 0; ",
Arrays.<Object>asList(getName(), getTimeoutSetName(), key), timeoutDate, objectState);
Arrays.<Object>asList(getName(), getTimeoutSetName()), timeoutDate, objectState, key);
} catch (IOException e) {
throw new RuntimeException(e);
}
@ -364,15 +363,20 @@ public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<
}
@Override
public Future<Boolean> addAsync(V e) {
byte[] key = hash(e);
return commandExecutor.evalWriteAsync(getName(), codec, EVAL_ADD,
"if redis.call('hexists', KEYS[1], KEYS[2]) == 0 then " +
"redis.call('hset', KEYS[1], KEYS[2], ARGV[1]); " +
public Future<Boolean> addAsync(V value) {
try {
byte[] objectState = encode(value);
byte[] key = hash(objectState);
return commandExecutor.evalWriteAsync(getName(), codec, RedisCommands.EVAL_BOOLEAN,
"if redis.call('hexists', KEYS[1], ARGV[1]) == 0 then " +
"redis.call('hset', KEYS[1], ARGV[1], ARGV[2]); " +
"return 1; " +
"end; " +
"return 0; ",
Arrays.<Object>asList(getName(), key), e);
Arrays.<Object>asList(getName()), key, objectState);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override

14
src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
Unescape Escape View File

@ -199,6 +199,13 @@ public class RedissonMapCacheReactive<K, V> extends RedissonMapReactive<K, V> im
@Override
public Publisher<V> putIfAbsent(K key, V value, long ttl, TimeUnit unit) {
if (ttl < 0) {
throw new IllegalArgumentException("TTL can't be negative");
}
if (ttl == 0) {
return putIfAbsent(key, value);
}
if (unit == null) {
throw new NullPointerException("TimeUnit param can't be null");
}
@ -282,6 +289,13 @@ public class RedissonMapCacheReactive<K, V> extends RedissonMapReactive<K, V> im
@Override
public Publisher<V> put(K key, V value, long ttl, TimeUnit unit) {
if (ttl < 0) {
throw new IllegalArgumentException("TTL can't be negative");
}
if (ttl == 0) {
return put(key, value);
}
if (unit == null) {
throw new NullPointerException("TimeUnit param can't be null");
}

52
src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
Unescape Escape View File

@ -36,7 +36,6 @@ import org.redisson.client.protocol.RedisCommands;
import org.redisson.client.protocol.RedisStrictCommand;
import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
import org.redisson.client.protocol.convertor.Convertor;
import org.redisson.client.protocol.convertor.LongReplayConvertor;
import org.redisson.client.protocol.convertor.VoidReplayConvertor;
import org.redisson.client.protocol.decoder.ListScanResult;
import org.redisson.client.protocol.decoder.ObjectListReplayDecoder;
@ -71,7 +70,6 @@ import reactor.rx.action.support.DefaultSubscriber;
public class RedissonSetCacheReactive<V> extends RedissonExpirableReactive implements RSetCacheReactive<V> {
private static final RedisCommand<Void> ADD_ALL = new RedisCommand<Void>("HMSET", new VoidReplayConvertor());
private static final RedisCommand<Long> EVAL_ADD = new RedisCommand<Long>("EVAL", new LongReplayConvertor(), 5);
private static final RedisCommand<List<Object>> EVAL_CONTAINS_KEY = new RedisCommand<List<Object>>("EVAL", new ObjectListReplayDecoder<Object>());
private static final RedisStrictCommand<Boolean> HDEL = new RedisStrictCommand<Boolean>("HDEL", new BooleanReplayConvertor());
@ -127,16 +125,16 @@ public class RedissonSetCacheReactive<V> extends RedissonExpirableReactive imple
byte[] key = hash(o);
Publisher<List<Object>> future = commandExecutor.evalReadReactive(getName(), codec, EVAL_CONTAINS_KEY,
"local value = redis.call('hexists', KEYS[1], KEYS[3]); " +
"local value = redis.call('hexists', KEYS[1], ARGV[1]); " +
"local expireDate = 92233720368547758; " +
"if value == 1 then " +
"local expireDateScore = redis.call('zscore', KEYS[2], KEYS[3]); "
"local expireDateScore = redis.call('zscore', KEYS[2], ARGV[1]); "
+ "if expireDateScore ~= false then "
+ "expireDate = tonumber(expireDateScore) "
+ "end; " +
"end;" +
"return {expireDate, value}; ",
Arrays.<Object>asList(getName(), getTimeoutSetName(), key));
Arrays.<Object>asList(getName(), getTimeoutSetName()), key);
addExpireListener(result, future, new BooleanReplayConvertor(), false);
@ -206,6 +204,25 @@ public class RedissonSetCacheReactive<V> extends RedissonExpirableReactive imple
@Override
public Publisher<Boolean> add(V value, long ttl, TimeUnit unit) {
if (ttl < 0) {
throw new IllegalArgumentException("TTL can't be negative");
}
if (ttl == 0) {
try {
byte[] objectState = encode(value);
byte[] key = hash(objectState);
return commandExecutor.evalWriteReactive(getName(), codec, RedisCommands.EVAL_BOOLEAN,
"if redis.call('hexists', KEYS[1], ARGV[1]) == 0 then " +
"redis.call('hset', KEYS[1], ARGV[1], ARGV[2]); " +
"return 1; " +
"end; " +
"return 0; ",
Arrays.<Object>asList(getName()), key, objectState);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
if (unit == null) {
throw new NullPointerException("TimeUnit param can't be null");
}
@ -216,13 +233,13 @@ public class RedissonSetCacheReactive<V> extends RedissonExpirableReactive imple
long timeoutDate = System.currentTimeMillis() + unit.toMillis(ttl);
return commandExecutor.evalWriteReactive(getName(), codec, RedisCommands.EVAL_BOOLEAN,
"redis.call('zadd', KEYS[2], ARGV[1], KEYS[3]); " +
"if redis.call('hexists', KEYS[1], KEYS[3]) == 0 then " +
"redis.call('hset', KEYS[1], KEYS[3], ARGV[2]); " +
"redis.call('zadd', KEYS[2], ARGV[1], ARGV[3]); " +
"if redis.call('hexists', KEYS[1], ARGV[3]) == 0 then " +
"redis.call('hset', KEYS[1], ARGV[3], ARGV[2]); " +
"return 1; " +
"end;" +
"return 0; ",
Arrays.<Object>asList(getName(), getTimeoutSetName(), key), timeoutDate, objectState);
Arrays.<Object>asList(getName(), getTimeoutSetName()), timeoutDate, objectState, key);
} catch (IOException e) {
throw new RuntimeException(e);
}
@ -233,15 +250,20 @@ public class RedissonSetCacheReactive<V> extends RedissonExpirableReactive imple
}
@Override
public Publisher<Long> add(V e) {
byte[] key = hash(e);
return commandExecutor.evalWriteReactive(getName(), codec, EVAL_ADD,
"if redis.call('hexists', KEYS[1], KEYS[2]) == 0 then " +
"redis.call('hset', KEYS[1], KEYS[2], ARGV[1]); " +
public Publisher<Long> add(V value) {
try {
byte[] objectState = encode(value);
byte[] key = hash(objectState);
return commandExecutor.evalWriteReactive(getName(), codec, RedisCommands.EVAL_LONG,
"if redis.call('hexists', KEYS[1], ARGV[1]) == 0 then " +
"redis.call('hset', KEYS[1], ARGV[1], ARGV[2]); " +
"return 1; " +
"end; " +
"return 0; ",
Arrays.<Object>asList(getName(), key), e);
Arrays.<Object>asList(getName()), key, objectState);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override

Write Preview
Loading…
Cancel
Save