diff --git a/src/main/java/org/redkale/cluster/CacheClusterAgent.java b/src/main/java/org/redkale/cluster/CacheClusterAgent.java index cf00d5e1f..3f52b4260 100644 --- a/src/main/java/org/redkale/cluster/CacheClusterAgent.java +++ b/src/main/java/org/redkale/cluster/CacheClusterAgent.java @@ -243,7 +243,7 @@ public class CacheClusterAgent extends ClusterAgent implements Resourcable { @Override public void deregister(Application application) { String serviceName = generateApplicationServiceName(); - source.remove(serviceName); + source.del(serviceName); } @Override @@ -282,7 +282,7 @@ public class CacheClusterAgent extends ClusterAgent implements Resourcable { } } } - source.hremove(serviceName, serviceid); + source.hdel(serviceName, serviceid); if (realcanceled && currEntry != null) currEntry.canceled = true; if (!"mqtp".equals(protocol) && currEntry != null && currEntry.submqtp) { deregister(ns, "mqtp", service, realcanceled); diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index dd04cc33d..6a7b6f2e6 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -141,7 +141,7 @@ public final class CacheMemorySource extends AbstractCacheSource { //----------- hxxx -------------- @Override - public int hremove(final String key, String... fields) { + public int hdel(final String key, String... fields) { int count = 0; CacheEntry entry = container.get(key); if (entry == null || entry.mapValue == null) return 0; @@ -387,8 +387,8 @@ public final class CacheMemorySource extends AbstractCacheSource { //----------- hxxx -------------- @Override - public CompletableFuture hremoveAsync(final String key, String... fields) { - return CompletableFuture.supplyAsync(() -> hremove(key, fields), getExecutor()); + public CompletableFuture hdelAsync(final String key, String... fields) { + return CompletableFuture.supplyAsync(() -> hdel(key, fields), getExecutor()); } @Override @@ -840,7 +840,7 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public void setExpireSeconds(String key, int expireSeconds) { + public void expire(String key, int expireSeconds) { if (key == null) return; CacheEntry entry = container.get(key); if (entry == null) return; @@ -848,12 +848,12 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public CompletableFuture setExpireSecondsAsync(final String key, final int expireSeconds) { - return CompletableFuture.runAsync(() -> setExpireSeconds(key, expireSeconds), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture expireAsync(final String key, final int expireSeconds) { + return CompletableFuture.runAsync(() -> expire(key, expireSeconds), getExecutor()).whenComplete(futureCompleteConsumer); } @Override - public int remove(String key) { + public int del(String key) { if (key == null) return 0; return container.remove(key) == null ? 0 : 1; } @@ -909,8 +909,8 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public CompletableFuture removeAsync(final String key) { - return CompletableFuture.supplyAsync(() -> remove(key), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture delAsync(final String key) { + return CompletableFuture.supplyAsync(() -> del(key), getExecutor()).whenComplete(futureCompleteConsumer); } @Override diff --git a/src/main/java/org/redkale/source/CacheSource.java b/src/main/java/org/redkale/source/CacheSource.java index 7033df809..a19a07804 100644 --- a/src/main/java/org/redkale/source/CacheSource.java +++ b/src/main/java/org/redkale/source/CacheSource.java @@ -41,7 +41,12 @@ public interface CacheSource extends Resourcable { public T getAndRefresh(final String key, final int expireSeconds, final Type type); //----------- hxxx -------------- - public int hremove(final String key, String... fields); + @Deprecated + default int hremove(final String key, String... fields) { + return hdel(key, fields); + } + + public int hdel(final String key, String... fields); public List hkeys(final String key); @@ -116,9 +121,19 @@ public interface CacheSource extends Resourcable { public void set(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); - public void setExpireSeconds(final String key, final int expireSeconds); + @Deprecated + default void setExpireSeconds(final String key, final int expireSeconds) { + expire(key, expireSeconds); + } - public int remove(final String key); + public void expire(final String key, final int seconds); + + @Deprecated + default int remove(final String key) { + return del(key); + } + + public int del(final String key); public long incr(final String key); @@ -277,9 +292,19 @@ public interface CacheSource extends Resourcable { public CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); - public CompletableFuture setExpireSecondsAsync(final String key, final int expireSeconds); + @Deprecated + default CompletableFuture setExpireSecondsAsync(final String key, final int expireSeconds) { + return expireAsync(key, expireSeconds); + } - public CompletableFuture removeAsync(final String key); + public CompletableFuture expireAsync(final String key, final int seconds); + + @Deprecated + default CompletableFuture removeAsync(final String key) { + return delAsync(key); + } + + public CompletableFuture delAsync(final String key); public CompletableFuture incrAsync(final String key); @@ -290,7 +315,12 @@ public interface CacheSource extends Resourcable { public CompletableFuture decrAsync(final String key, long num); //----------- hxxx -------------- - public CompletableFuture hremoveAsync(final String key, String... fields); + @Deprecated + default CompletableFuture hremoveAsync(final String key, String... fields) { + return hdelAsync(key, fields); + } + + public CompletableFuture hdelAsync(final String key, String... fields); public CompletableFuture> hkeysAsync(final String key);