Merge 7d68b74602 into 7ff2deccee

redisson/src/main/java/org/redisson/Redisson.java

@@ -374,6 +374,7 @@ public final class Redisson implements RedissonClient {
                 .cacheProvider(LocalCachedMapOptions.CacheProvider.valueOf(params.getCacheProvider().toString()))
                 .cacheSize(params.getCacheSize())
                 .storeMode(LocalCachedMapOptions.StoreMode.valueOf(params.getStoreMode().toString()))
+                .readMode(LocalCachedMapOptions.ReadMode.valueOf(params.getReadMode().toString()))
                 .evictionPolicy(LocalCachedMapOptions.EvictionPolicy.valueOf(params.getEvictionPolicy().toString()))
                 .maxIdle(params.getMaxIdleInMillis())
                 .loader(params.getLoader())

redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java

@@ -58,6 +58,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
     private int invalidateEntryOnChange;
     private SyncStrategy syncStrategy;
     private LocalCachedMapOptions.StoreMode storeMode;
+    private LocalCachedMapOptions.ReadMode readMode;
     private boolean storeCacheMiss;
     private boolean isUseObjectAsCacheKey;
 
@@ -78,6 +79,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         }
         syncStrategy = options.getSyncStrategy();
         storeMode = options.getStoreMode();
+        readMode = options.getReadMode();
         storeCacheMiss = options.isStoreCacheMiss();
         isUseObjectAsCacheKey = options.isUseObjectAsCacheKey();
         localCacheView = new LocalCacheView<>(options, this);
@@ -94,6 +96,11 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
                 return new CacheValue(key, value);
             }
 
+            @Override
+            protected void reloadCache() {
+                RedissonLocalCachedMap.this.reloadCache();
+            }
+
         };
         listener.add(cache, cacheKeyMap);
         instanceId = listener.getInstanceId();
@@ -213,7 +220,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
 
     @Override
     public RFuture<Integer> sizeAsync() {
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return new CompletableFutureWrapper<>(cache.size());
         }
         return super.sizeAsync();
@@ -226,7 +233,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         CacheKey cacheKey = localCacheView.toCacheKey(key);
         CacheValue cacheValue = cache.get(cacheKey);
         if (cacheValue == null) {
-            if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+            if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
                 if (hasNoLoader()) {
                     return new CompletableFutureWrapper<>(false);
                 }
@@ -273,7 +280,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         
         CacheValue cacheValue = new CacheValue(null, value);
         if (!cache.containsValue(cacheValue)) {
-            if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+            if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
                 return new CompletableFutureWrapper<>(false);
             }
 
@@ -292,7 +299,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
             return new CompletableFutureWrapper<>((V) cacheValue.getValue());
         }
 
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             if (hasNoLoader()) {
                 return new CompletableFutureWrapper((Void) null);
             }
@@ -669,7 +676,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
             }
         }
 
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             if (hasNoLoader()) {
                 return new CompletableFutureWrapper<>(result);
             }
@@ -921,7 +928,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
             result.add((V) value.getValue());
         }
 
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return new CompletableFutureWrapper<>(result);
         }
 
@@ -964,7 +971,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
             result.put((K) value.getKey(), (V) value.getValue());
         }
 
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return new CompletableFutureWrapper<>(result);
         }
 
@@ -989,6 +996,19 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         }
     }
 
+    @Override
+    public void reloadCache() {
+        Set<CacheKey> existingCacheKeys = new HashSet<>(cache.keySet());
+        for (Entry<K, V> entry : super.entrySet(null, 10)) {
+            CacheKey cacheKey = localCacheView.toCacheKey(entry.getKey());
+            cachePut(cacheKey, entry.getKey(), entry.getValue());
+            existingCacheKeys.remove(cacheKey);
+        }
+        for (CacheKey cacheKey : existingCacheKeys) {
+            cacheRemove(cacheKey);
+        }
+    }
+
     @Override
     public void preloadCache(int count) {
         for (Entry<K, V> entry : super.entrySet(count)) {
@@ -1020,7 +1040,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
             result.add(new AbstractMap.SimpleEntry<K, V>((K) value.getKey(), (V) value.getValue()));
         }
 
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return new CompletableFutureWrapper<>(result);
         }
 
@@ -1354,7 +1374,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
 
     @Override
     public Set<K> keySet(String pattern, int count) {
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return cachedKeySet();
         }
         return super.keySet(pattern, count);
@@ -1362,7 +1382,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
 
     @Override
     public Collection<V> values(String keyPattern, int count) {
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return cachedValues();
         }
         return super.values(keyPattern, count);
@@ -1370,7 +1390,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
 
     @Override
     public Set<Entry<K, V>> entrySet(String keyPattern, int count) {
-        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE) {
+        if (storeMode == LocalCachedMapOptions.StoreMode.LOCALCACHE || readMode == LocalCachedMapOptions.ReadMode.LOCALCACHE) {
             return cachedEntrySet();
         }
         return super.entrySet(keyPattern, count);

redisson/src/main/java/org/redisson/RedissonReactive.java

@@ -1142,6 +1142,7 @@ public final class RedissonReactive implements RedissonReactiveClient {
                 .cacheProvider(LocalCachedMapOptions.CacheProvider.valueOf(params.getCacheProvider().toString()))
                 .cacheSize(params.getCacheSize())
                 .storeMode(LocalCachedMapOptions.StoreMode.valueOf(params.getStoreMode().toString()))
+                .readMode(LocalCachedMapOptions.ReadMode.valueOf(params.getReadMode().toString()))
                 .evictionPolicy(LocalCachedMapOptions.EvictionPolicy.valueOf(params.getEvictionPolicy().toString()))
                 .maxIdle(params.getMaxIdleInMillis())
                 .loader(params.getLoader())

redisson/src/main/java/org/redisson/RedissonRx.java

@@ -1119,6 +1119,7 @@ public final class RedissonRx implements RedissonRxClient {
                 .cacheProvider(LocalCachedMapOptions.CacheProvider.valueOf(params.getCacheProvider().toString()))
                 .cacheSize(params.getCacheSize())
                 .storeMode(LocalCachedMapOptions.StoreMode.valueOf(params.getStoreMode().toString()))
+                .readMode(LocalCachedMapOptions.ReadMode.valueOf(params.getReadMode().toString()))
                 .evictionPolicy(LocalCachedMapOptions.EvictionPolicy.valueOf(params.getEvictionPolicy().toString()))
                 .maxIdle(params.getMaxIdleInMillis())
                 .loader(params.getLoader())

redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java

@@ -57,7 +57,12 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
          * if LocalCachedMap instance has been disconnected less than 10 minutes 
          * or whole local cache will be cleaned otherwise.
          */
-        LOAD
+        LOAD,
+
+        /**
+         * Reload local cache if map instance connect/disconnected.
+         */
+        RELOAD
         
     }
     
@@ -132,6 +137,20 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
 
     }
 
+    public enum ReadMode {
+
+        /**
+         * Read data only in local cache.
+         */
+        LOCALCACHE,
+
+        /**
+         * Read data in Redis if not found in local cache.
+         */
+        LOCALCACHE_REDIS
+
+    }
+
     public enum ExpirationEventPolicy {
 
         /**
@@ -159,6 +178,7 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
     private long maxIdleInMillis;
     private CacheProvider cacheProvider;
     private StoreMode storeMode;
+    private ReadMode readMode;
     private boolean storeCacheMiss;
     private ExpirationEventPolicy expirationEventPolicy;
     private boolean useObjectAsCacheKey;
@@ -176,6 +196,7 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
         this.maxIdleInMillis = copy.maxIdleInMillis;
         this.cacheProvider = copy.cacheProvider;
         this.storeMode = copy.storeMode;
+        this.readMode = copy.readMode;
         this.storeCacheMiss = copy.storeCacheMiss;
         this.useObjectAsCacheKey = copy.useObjectAsCacheKey;
     }
@@ -207,6 +228,7 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
                     .reconnectionStrategy(ReconnectionStrategy.NONE)
                     .cacheProvider(CacheProvider.REDISSON)
                     .storeMode(StoreMode.LOCALCACHE_REDIS)
+                    .readMode(ReadMode.LOCALCACHE_REDIS)
                     .syncStrategy(SyncStrategy.INVALIDATE)
                     .storeCacheMiss(false)
                     .useObjectAsCacheKey(false)
@@ -263,6 +285,7 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
      * @param reconnectionStrategy
      *          <p><code>CLEAR</code> - clear local cache if map instance has been disconnected for a while.
      *          <p><code>LOAD</code> - store invalidated entry hash in invalidation log for 10 minutes. Cache keys for stored invalidated entry hashes will be removed if LocalCachedMap instance has been disconnected less than 10 minutes or whole cache will be cleaned otherwise
+     *          <p><code>RELOAD</code> - <p><code>NONE</code> - Reload local cache if map instance connect/disconnected.
      *          <p><code>NONE</code> - Default. No reconnection handling
      * @return LocalCachedMapOptions instance
      */
@@ -364,6 +387,10 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
         return storeMode;
     }
 
+    public ReadMode getReadMode() {
+        return readMode;
+    }
+
     /**
      * Defines store mode of cache data.
      *
@@ -377,6 +404,19 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
         return this;
     }
 
+    /**
+     * Defines read mode of cache data.
+     *
+     * @param readMode
+     *         <p><code>LOCALCACHE</code> - read data in local cache only.
+     *         <p><code>LOCALCACHE_REDIS</code> - read data in Redis if not found in local cache.
+     * @return LocalCachedMapOptions instance
+     */
+    public LocalCachedMapOptions<K, V> readMode(ReadMode readMode) {
+        this.readMode = readMode;
+        return this;
+    }
+
     /**
      * Defines Cache provider used as local cache store.
      *

redisson/src/main/java/org/redisson/api/RLocalCachedMap.java

@@ -39,6 +39,13 @@ public interface RLocalCachedMap<K, V> extends RMap<K, V> {
      */
     void preloadCache();
 
+    /**
+     * Reload the cached entries. Not guaranteed to load ALL values, but statistically
+     * will reload approximately all (all if no concurrent mutating activity).
+     * Entries are loaded in a batch with size of 10 elements.
+     */
+    void reloadCache();
+
     /**
      * Pre-warm the cached entries. Not guaranteed to load ALL values, but statistically
      * will preload approximately all (all if no concurrent mutating activity)

redisson/src/main/java/org/redisson/api/options/LocalCachedMapOptions.java

@@ -50,7 +50,12 @@ public interface LocalCachedMapOptions<K, V> extends ExMapOptions<LocalCachedMap
          * if LocalCachedMap instance has been disconnected less than 10 minutes 
          * or whole local cache will be cleaned otherwise.
          */
-        LOAD
+        LOAD,
+
+        /**
+         * Reload local cache if map instance connect/disconnected.
+         */
+        RELOAD
         
     }
     
@@ -125,6 +130,20 @@ public interface LocalCachedMapOptions<K, V> extends ExMapOptions<LocalCachedMap
 
     }
 
+    enum ReadMode {
+
+        /**
+         * Read data only in local cache.
+         */
+        LOCALCACHE,
+
+        /**
+         * Read data in Redis if not found in local cache.
+         */
+        LOCALCACHE_REDIS
+
+    }
+
     enum ExpirationEventPolicy {
 
         /**
@@ -172,6 +191,7 @@ public interface LocalCachedMapOptions<K, V> extends ExMapOptions<LocalCachedMap
      * @param reconnectionStrategy
      *          <p><code>CLEAR</code> - clear local cache if map instance has been disconnected for a while.
      *          <p><code>LOAD</code> - store invalidated entry hash in invalidation log for 10 minutes. Cache keys for stored invalidated entry hashes will be removed if LocalCachedMap instance has been disconnected less than 10 minutes or whole cache will be cleaned otherwise
+     *          <p><code>RELOAD</code> - Reload local cache if map instance connect/disconnected.
      *          <p><code>NONE</code> - Default. No reconnection handling
      * @return LocalCachedMapOptions instance
      */
@@ -228,6 +248,16 @@ public interface LocalCachedMapOptions<K, V> extends ExMapOptions<LocalCachedMap
      */
     LocalCachedMapOptions<K, V> storeMode(StoreMode storeMode);
 
+    /**
+     * Defines read mode of cache data.
+     *
+     * @param readMode
+     *         <p><code>LOCALCACHE</code> - read data in local cache only.
+     *         <p><code>LOCALCACHE_REDIS</code> - read data in Redis if not found in local cache.
+     * @return LocalCachedMapOptions instance
+     */
+    LocalCachedMapOptions<K, V> readMode(LocalCachedMapOptions.ReadMode readMode);
+
     /**
      * Defines Cache provider used as local cache store.
      *

redisson/src/main/java/org/redisson/api/options/LocalCachedMapParams.java

@@ -36,6 +36,7 @@ public final class LocalCachedMapParams<K, V> extends BaseMapOptions<LocalCached
     private long maxIdleInMillis;
     private CacheProvider cacheProvider = CacheProvider.REDISSON;
     private StoreMode storeMode = StoreMode.LOCALCACHE_REDIS;
+    private ReadMode readMode = ReadMode.LOCALCACHE_REDIS;
     private boolean storeCacheMiss;
 
     private ExpirationEventPolicy expirationEventPolicy = ExpirationEventPolicy.SUBSCRIBE_WITH_KEYEVENT_PATTERN;
@@ -96,6 +97,7 @@ public final class LocalCachedMapParams<K, V> extends BaseMapOptions<LocalCached
      * @param reconnectionStrategy
      *          <p><code>CLEAR</code> - clear local cache if map instance has been disconnected for a while.
      *          <p><code>LOAD</code> - store invalidated entry hash in invalidation log for 10 minutes. Cache keys for stored invalidated entry hashes will be removed if LocalCachedMap instance has been disconnected less than 10 minutes or whole cache will be cleaned otherwise
+     *          <p><code>RELOAD</code> - Reload local cache if map instance connect/disconnected.
      *          <p><code>NONE</code> - Default. No reconnection handling
      * @return LocalCachedMapOptions instance
      */
@@ -173,6 +175,10 @@ public final class LocalCachedMapParams<K, V> extends BaseMapOptions<LocalCached
         return storeMode;
     }
 
+    public ReadMode getReadMode() {
+        return readMode;
+    }
+
     /**
      * Defines store mode of cache data.
      *
@@ -186,6 +192,19 @@ public final class LocalCachedMapParams<K, V> extends BaseMapOptions<LocalCached
         return this;
     }
 
+    /**
+     * Defines read mode of cache data.
+     *
+     * @param readMode
+     *         <p><code>LOCALCACHE</code> - read data in local cache only.
+     *         <p><code>LOCALCACHE_REDIS</code> - read data in Redis if not found in local cache.
+     * @return LocalCachedMapOptions instance
+     */
+    public LocalCachedMapParams<K, V> readMode(ReadMode readMode) {
+        this.readMode = readMode;
+        return this;
+    }
+
     /**
      * Defines Cache provider used as local cache store.
      *

redisson/src/main/java/org/redisson/cache/LocalCacheListener.java

@@ -298,6 +298,9 @@ public abstract class LocalCacheListener {
 
             loadAfterReconnection();
         }
+        if (options.getReconnectionStrategy() == ReconnectionStrategy.RELOAD) {
+            reloadCache();
+        }
     }
 
     public void notifyUpdate(CacheValue value) {
@@ -358,6 +361,7 @@ public abstract class LocalCacheListener {
     }
 
     protected abstract CacheValue updateCache(ByteBuf keyBuf, ByteBuf valueBuf) throws IOException;
+    protected abstract void reloadCache();
 
     private void disableKeys(final String requestId, final Set<CacheKey> keys, long timeout) {
         for (CacheKey key : keys) {

redisson/src/main/java/org/redisson/transaction/RedissonTransactionalLocalCachedMap.java

@@ -50,6 +50,11 @@ public class RedissonTransactionalLocalCachedMap<K, V> extends RedissonTransacti
         throw new UnsupportedOperationException("preloadCache method is not supported in transaction");
     }
 
+    @Override
+    public void reloadCache() {
+        throw new UnsupportedOperationException("reloadCache method is not supported in transaction");
+    }
+
     @Override
     public void preloadCache(int count) {
         throw new UnsupportedOperationException("preloadCache method is not supported in transaction");