diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java index fbb15f922..f4cb4c3e4 100644 --- a/src/org/redkale/net/http/WebSocketNode.java +++ b/src/org/redkale/net/http/WebSocketNode.java @@ -428,7 +428,7 @@ public abstract class WebSocketNode { keyuser.put(keys[i], userids[i]); } tryAcquireSemaphore(); - CompletableFuture>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(InetSocketAddress.class, keys); + CompletableFuture>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(true, InetSocketAddress.class, keys); if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore()); rsfuture = addrsFuture.thenCompose((Map> addrs) -> { if (addrs == null || addrs.isEmpty()) { @@ -692,7 +692,7 @@ public abstract class WebSocketNode { keyuser.put(keys[i], userids[i]); } tryAcquireSemaphore(); - CompletableFuture>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(InetSocketAddress.class, keys); + CompletableFuture>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(true, InetSocketAddress.class, keys); if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore()); rsfuture = addrsFuture.thenCompose((Map> addrs) -> { if (addrs == null || addrs.isEmpty()) { diff --git a/src/org/redkale/source/CacheMemorySource.java b/src/org/redkale/source/CacheMemorySource.java index d6feddcee..cdde28cc8 100644 --- a/src/org/redkale/source/CacheMemorySource.java +++ b/src/org/redkale/source/CacheMemorySource.java @@ -677,7 +677,7 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public Map> getCollectionMap(final Type componentType, final String... keys) { + public Map> getCollectionMap(final boolean set, final Type componentType, final String... keys) { Map> map = new HashMap<>(); for (String key : keys) { Collection s = (Collection) get(key); @@ -692,7 +692,7 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public Map> getStringCollectionMap(final String... keys) { + public Map> getStringCollectionMap(final boolean set, final String... keys) { Map> map = new HashMap<>(); for (String key : keys) { Collection s = (Collection) get(key); @@ -707,7 +707,7 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public Map> getLongCollectionMap(final String... keys) { + public Map> getLongCollectionMap(final boolean set, final String... keys) { Map> map = new HashMap<>(); for (String key : keys) { Collection s = (Collection) get(key); @@ -727,8 +727,8 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public CompletableFuture>> getCollectionMapAsync(final Type componentType, final String... keys) { - return CompletableFuture.supplyAsync(() -> getCollectionMap(componentType, keys), getExecutor()); + public CompletableFuture>> getCollectionMapAsync(final boolean set, final Type componentType, final String... keys) { + return CompletableFuture.supplyAsync(() -> getCollectionMap(set, componentType, keys), getExecutor()); } @Override @@ -737,8 +737,8 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public CompletableFuture>> getStringCollectionMapAsync(final String... keys) { - return CompletableFuture.supplyAsync(() -> getStringCollectionMap(keys), getExecutor()); + public CompletableFuture>> getStringCollectionMapAsync(final boolean set, final String... keys) { + return CompletableFuture.supplyAsync(() -> getStringCollectionMap(set, keys), getExecutor()); } @Override @@ -747,8 +747,8 @@ public class CacheMemorySource extends AbstractService impleme } @Override - public CompletableFuture>> getLongCollectionMapAsync(final String... keys) { - return CompletableFuture.supplyAsync(() -> getLongCollectionMap(keys), getExecutor()); + public CompletableFuture>> getLongCollectionMapAsync(final boolean set, final String... keys) { + return CompletableFuture.supplyAsync(() -> getLongCollectionMap(set, keys), getExecutor()); } @Override diff --git a/src/org/redkale/source/CacheSource.java b/src/org/redkale/source/CacheSource.java index 6d2a8eb23..c462a186d 100644 --- a/src/org/redkale/source/CacheSource.java +++ b/src/org/redkale/source/CacheSource.java @@ -92,7 +92,7 @@ public interface CacheSource { public Collection getCollection(final String key, final Type componentType); - public Map> getCollectionMap(final Type componentType, final String... keys); + public Map> getCollectionMap(final boolean set, final Type componentType, final String... keys); public int getCollectionSize(final String key); @@ -140,7 +140,7 @@ public interface CacheSource { public Collection getStringCollection(final String key); - public Map> getStringCollectionMap(final String... keys); + public Map> getStringCollectionMap(final boolean set, final String... keys); public Collection getStringCollectionAndRefresh(final String key, final int expireSeconds); @@ -164,7 +164,7 @@ public interface CacheSource { public Collection getLongCollection(final String key); - public Map> getLongCollectionMap(final String... keys); + public Map> getLongCollectionMap(final boolean set, final String... keys); public Collection getLongCollectionAndRefresh(final String key, final int expireSeconds); @@ -241,7 +241,7 @@ public interface CacheSource { public CompletableFuture> getCollectionAsync(final String key, final Type componentType); - public CompletableFuture>> getCollectionMapAsync(final Type componentType, final String... keys); + public CompletableFuture>> getCollectionMapAsync(final boolean set, final Type componentType, final String... keys); public CompletableFuture getCollectionSizeAsync(final String key); @@ -289,7 +289,7 @@ public interface CacheSource { public CompletableFuture> getStringCollectionAsync(final String key); - public CompletableFuture>> getStringCollectionMapAsync(final String... keys); + public CompletableFuture>> getStringCollectionMapAsync(final boolean set, final String... keys); public CompletableFuture> getStringCollectionAndRefreshAsync(final String key, final int expireSeconds); @@ -313,7 +313,7 @@ public interface CacheSource { public CompletableFuture> getLongCollectionAsync(final String key); - public CompletableFuture>> getLongCollectionMapAsync(final String... keys); + public CompletableFuture>> getLongCollectionMapAsync(final boolean set, final String... keys); public CompletableFuture> getLongCollectionAndRefreshAsync(final String key, final int expireSeconds);