CacheSource增加pttl等接口

src/main/java/org/redkale/source/CacheMemorySource.java

@@ -517,6 +517,93 @@ public final class CacheMemorySource extends AbstractCacheSource {
         return runFuture(() -> pexpire(key, milliSeconds));
     }
 
+    @Override
+    public long ttl(String key) {
+        long v = pttl(key);
+        return v > 0 ? v / 1000 : v;
+    }
+
+    @Override
+    public long pttl(String key) {
+        CacheEntry entry = find(key);
+        if (entry == null) {
+            return -2;
+        }
+        if (entry.expireMills < 1) {
+            return -1;
+        }
+        return entry.initTime + entry.expireMills - System.currentTimeMillis();
+    }
+
+    @Override
+    public CompletableFuture<Long> ttlAsync(String key) {
+        return supplyFuture(() -> ttl(key));
+    }
+
+    @Override
+    public CompletableFuture<Long> pttlAsync(String key) {
+        return supplyFuture(() -> pttl(key));
+    }
+
+    @Override
+    public void expireAt(String key, long secondsTime) {
+        pexpireAt(key, secondsTime * 1000);
+    }
+
+    @Override
+    public void pexpireAt(String key, long milliTime) {
+        CacheEntry entry = find(key);
+        if (entry == null) {
+            return;
+        }
+        if (milliTime > 0) {
+            entry.lock();
+            try {
+                entry.endTime = milliTime;
+            } finally {
+                entry.unlock();
+            }
+        }
+    }
+
+    @Override
+    public CompletableFuture<Void> pexpireAtAsync(String key, long milliTime) {
+        return runFuture(() -> pexpireAt(key, milliTime));
+    }
+
+    @Override
+    public CompletableFuture<Void> expireAtAsync(String key, long secondsTime) {
+        return runFuture(() -> expireAt(key, secondsTime));
+    }
+
+    @Override
+    public long expireTime(String key) {
+        long v = pexpireTime(key);
+        return v > 0 ? v / 1000 : v;
+    }
+
+    @Override
+    public long pexpireTime(String key) {
+        CacheEntry entry = find(key);
+        if (entry == null) {
+            return -2;
+        }
+        if (entry.endTime < 1) {
+            return -1;
+        }
+        return entry.endTime;
+    }
+
+    @Override
+    public CompletableFuture<Long> expireTimeAsync(String key) {
+        return supplyFuture(() -> expireTime(key));
+    }
+
+    @Override
+    public CompletableFuture<Long> pexpireTimeAsync(String key) {
+        return supplyFuture(() -> pexpireTime(key));
+    }
+
     @Override
     public boolean persist(final String key) {
         CacheEntry entry = find(key);
@@ -2343,6 +2430,8 @@ public final class CacheMemorySource extends AbstractCacheSource {
 
         private long initTime;
 
+        private long endTime;
+
         private final ReentrantLock lock = new ReentrantLock();
 
         public CacheEntry(CacheEntryType cacheType, String key) {
@@ -2365,6 +2454,11 @@ public final class CacheMemorySource extends AbstractCacheSource {
             return this;
         }
 
+        public CacheEntry expireAt(long endtime) {
+            this.endTime = endtime;
+            return this;
+        }
+
         @Override
         public String toString() {
             return JsonFactory.root().getConvert().convertTo(this);
@@ -2372,7 +2466,11 @@ public final class CacheMemorySource extends AbstractCacheSource {
 
         @ConvertColumn(ignore = true)
         public boolean isExpired() {
-            return expireMills > 0 && (initTime + expireMills) < System.currentTimeMillis();
+            long now = System.currentTimeMillis();
+            if (endTime > 0) {
+                return now >= endTime;
+            }
+            return expireMills > 0 && (initTime + expireMills) < now;
         }
 
         //value类型只能是byte[]/String/AtomicLong

src/main/java/org/redkale/source/CacheSource.java

@@ -381,6 +381,30 @@ public interface CacheSource extends Resourcable {
         pexpireAsync(key, milliSeconds).join();
     }
 
+    default long ttl(String key) {
+        return ttlAsync(key).join();
+    }
+
+    default long pttl(String key) {
+        return pttlAsync(key).join();
+    }
+
+    default void expireAt(String key, long secondsTime) {
+        expireAtAsync(key, secondsTime).join();
+    }
+
+    default void pexpireAt(String key, long milliTime) {
+        pexpireAtAsync(key, milliTime).join();
+    }
+
+    default long pexpireTime(String key) {
+        return pexpireTimeAsync(key).join();
+    }
+
+    default long expireTime(String key) {
+        return expireTimeAsync(key).join();
+    }
+
     default List<String> keys(String pattern) {
         return keysAsync(pattern).join();
     }
@@ -1285,6 +1309,18 @@ public interface CacheSource extends Resourcable {
 
     public CompletableFuture<Void> pexpireAsync(String key, long milliSeconds);
 
+    public CompletableFuture<Long> ttlAsync(String key);
+
+    public CompletableFuture<Long> pttlAsync(String key);
+
+    public CompletableFuture<Void> expireAtAsync(String key, long secondsTime);
+
+    public CompletableFuture<Long> expireTimeAsync(String key);
+
+    public CompletableFuture<Void> pexpireAtAsync(String key, long milliTime);
+
+    public CompletableFuture<Long> pexpireTimeAsync(String key);
+
     public CompletableFuture<List<String>> keysAsync(String pattern);
 
     default CompletableFuture<List<String>> keysAsync() {