github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed - deserialization exception is thrown if RMapCache.EntryRemovedListener is set. #2941

Browse Source
pull/2954/head
Nikita Koksharov 5 years ago
parent b60a1cb4bc
commit 1c49817499
2 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File

33
redisson/src/main/java/org/redisson/RedissonMapCache.java
Unescape Escape View File

@ -366,7 +366,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[6]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -522,7 +523,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem);" +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7];" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg);" +
"end; " +
" end;" +
@ -593,7 +595,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[6]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -691,7 +694,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -819,7 +823,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -954,7 +959,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -1356,7 +1362,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -1408,7 +1415,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[6]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -1554,7 +1562,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem); " +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[6]; " +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg); " +
"end; " +
" end; " +
@ -1747,7 +1756,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem);" +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7];" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg);"
+ "end; " +
" end;" +
@ -1846,7 +1856,8 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
" redis.call('zrem', lastAccessTimeSetName, lruItem);" +
" if lruItemValue ~= false then " +
" local removedChannelName = KEYS[7];" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" +
"local ttl, obj = struct.unpack('dLc0', lruItemValue);" +
" local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(obj), obj);" +
" redis.call('publish', removedChannelName, msg);"
+ "end; " +
" end;" +

31
redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
Unescape Escape View File

@ -16,16 +16,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.joor.Reflect;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
import org.redisson.api.MapOptions;
import org.redisson.api.*;
import org.redisson.api.MapOptions.WriteMode;
import org.redisson.api.RMap;
import org.redisson.api.RMapCache;
import org.redisson.api.RedissonClient;
import org.redisson.api.map.event.EntryCreatedListener;
import org.redisson.api.map.event.EntryEvent;
import org.redisson.api.map.event.EntryExpiredListener;
@ -42,6 +40,31 @@ import org.redisson.eviction.EvictionScheduler;
public class RedissonMapCacheTest extends BaseMapTest {
@Test
public void testRemoveListener() {
RMapCache<Long, String> rMapCache = redisson.getMapCache("test",
LocalCachedMapOptions.<Long, String>defaults().evictionPolicy(LocalCachedMapOptions.EvictionPolicy.LRU)
.timeToLive(-1));
rMapCache.trySetMaxSize(5);
AtomicBoolean removed = new AtomicBoolean();
rMapCache.addListener(new EntryRemovedListener() {
@Override
public void onRemoved(EntryEvent event) {
removed.set(true);
}
});
rMapCache.put(1L, "1");
rMapCache.put(2L, "2");
rMapCache.put(3L, "3");
rMapCache.put(4L, "4");
rMapCache.put(5L, "5");
rMapCache.put(6L, "6");
Awaitility.await().atMost(5, TimeUnit.SECONDS).untilTrue(removed);
}
@Test
public void testDestroy() {
RMapCache<String, String> cache = redisson.getMapCache("test");

Write Preview
Loading…
Cancel
Save