TTL value checking

src/main/java/org/redisson/RedissonSetCache.java

@@ -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]); " +
+                    "redis.call('zadd', KEYS[2], ARGV[1], ARGV[3]); " +
-                            "if redis.call('hexists', KEYS[1], KEYS[3]) == 0 then " +
+                            "if redis.call('hexists', KEYS[1], ARGV[3]) == 0 then " +
-                            "redis.call('hset', KEYS[1], KEYS[3], ARGV[2]); " +
+                            "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) {
+    public Future<Boolean> addAsync(V value) {
-        byte[] key = hash(e);
+        try {
-        return commandExecutor.evalWriteAsync(getName(), codec, EVAL_ADD,
+            byte[] objectState = encode(value);
-                  "if redis.call('hexists', KEYS[1], KEYS[2]) == 0 then " +
+            byte[] key = hash(objectState);
-                      "redis.call('hset', KEYS[1], KEYS[2], ARGV[1]); " +
+            return commandExecutor.evalWriteAsync(getName(), codec, RedisCommands.EVAL_BOOLEAN,
-                      "return 1; " +
+                    "if redis.call('hexists', KEYS[1], ARGV[1]) == 0 then " +
-                  "end; " +
+                        "redis.call('hset', KEYS[1], ARGV[1], ARGV[2]); " +
-                  "return 0; ",
+                        "return 1; " +
-                Arrays.<Object>asList(getName(), key), e);
+                    "end; " +
+                    "return 0; ",
+                Arrays.<Object>asList(getName()), key, objectState);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override

src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java

@@ -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");
         }

src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java

@@ -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]); " +
+                    "redis.call('zadd', KEYS[2], ARGV[1], ARGV[3]); " +
-                            "if redis.call('hexists', KEYS[1], KEYS[3]) == 0 then " +
+                            "if redis.call('hexists', KEYS[1], ARGV[3]) == 0 then " +
-                            "redis.call('hset', KEYS[1], KEYS[3], ARGV[2]); " +
+                            "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) {
+    public Publisher<Long> add(V value) {
-        byte[] key = hash(e);
+        try {
-        return commandExecutor.evalWriteReactive(getName(), codec, EVAL_ADD,
+            byte[] objectState = encode(value);
-                  "if redis.call('hexists', KEYS[1], KEYS[2]) == 0 then " +
+            byte[] key = hash(objectState);
-                      "redis.call('hset', KEYS[1], KEYS[2], ARGV[1]); " +
+            return commandExecutor.evalWriteReactive(getName(), codec, RedisCommands.EVAL_LONG,
-                      "return 1; " +
+                    "if redis.call('hexists', KEYS[1], ARGV[1]) == 0 then " +
-                  "end; " +
+                        "redis.call('hset', KEYS[1], ARGV[1], ARGV[2]); " +
-                  "return 0; ",
+                        "return 1; " +
-                Arrays.<Object>asList(getName(), key), e);
+                    "end; " +
+                    "return 0; ",
+                Arrays.<Object>asList(getName()), key, objectState);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override