diff --git a/redisson/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java index dca0b53ea..5b7c88c4e 100644 --- a/redisson/src/main/java/org/redisson/RedissonMapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonMapCache.java @@ -363,9 +363,11 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " redis.call('zrem', KEYS[2], lruItem); " + " redis.call('zrem', KEYS[3], lruItem); " + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[6]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " local removedChannelName = KEYS[6]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -527,9 +529,11 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " redis.call('zrem', KEYS[2], lruItem);" + " redis.call('zrem', KEYS[3], lruItem);" + " redis.call('zrem', lastAccessTimeSetName, lruItem);" + - " local removedChannelName = KEYS[7];" + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" + - " redis.call('publish', removedChannelName, msg);" + + " if lruItemValue ~= false then " + + " local removedChannelName = KEYS[7];" + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" + + " redis.call('publish', removedChannelName, msg);" + + "end; " + " end;" + " end" + " end;" + @@ -596,9 +600,11 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " redis.call('zrem', KEYS[2], lruItem); " + " redis.call('zrem', KEYS[3], lruItem); " + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[6]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " local removedChannelName = KEYS[6]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -672,9 +678,11 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " redis.call('zrem', KEYS[2], lruItem); " + " redis.call('zrem', KEYS[3], lruItem); " + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[7]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " local removedChannelName = KEYS[7]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -804,9 +812,11 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " redis.call('zrem', KEYS[2], lruItem); " + " redis.call('zrem', KEYS[3], lruItem); " + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[7]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " local removedChannelName = KEYS[7]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -936,13 +946,15 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " for index, lruItem in ipairs(lruItems) do " + " if lruItem then " + " local lruItemValue = redis.call('hget', KEYS[1], lruItem); " + - " redis.call('hdel', KEYS[1], lruItem); " + - " redis.call('zrem', KEYS[2], lruItem); " + - " redis.call('zrem', KEYS[3], lruItem); " + - " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[7]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " redis.call('hdel', KEYS[1], lruItem); " + + " redis.call('zrem', KEYS[2], lruItem); " + + " redis.call('zrem', KEYS[3], lruItem); " + + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + + " local removedChannelName = KEYS[7]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -1335,13 +1347,15 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " for index, lruItem in ipairs(lruItems) do " + " if lruItem then " + " local lruItemValue = redis.call('hget', KEYS[1], lruItem); " + - " redis.call('hdel', KEYS[1], lruItem); " + - " redis.call('zrem', KEYS[2], lruItem); " + - " redis.call('zrem', KEYS[3], lruItem); " + - " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[7]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " redis.call('hdel', KEYS[1], lruItem); " + + " redis.call('zrem', KEYS[2], lruItem); " + + " redis.call('zrem', KEYS[3], lruItem); " + + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + + " local removedChannelName = KEYS[7]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -1385,13 +1399,15 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " for index, lruItem in ipairs(lruItems) do " + " if lruItem then " + " local lruItemValue = redis.call('hget', KEYS[1], lruItem); " + - " redis.call('hdel', KEYS[1], lruItem); " + - " redis.call('zrem', KEYS[2], lruItem); " + - " redis.call('zrem', KEYS[3], lruItem); " + - " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[6]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " redis.call('hdel', KEYS[1], lruItem); " + + " redis.call('zrem', KEYS[2], lruItem); " + + " redis.call('zrem', KEYS[3], lruItem); " + + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + + " local removedChannelName = KEYS[6]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -1529,13 +1545,15 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " for index, lruItem in ipairs(lruItems) do " + " if lruItem then " + " local lruItemValue = redis.call('hget', KEYS[1], lruItem); " + - " redis.call('hdel', KEYS[1], lruItem); " + - " redis.call('zrem', KEYS[2], lruItem); " + - " redis.call('zrem', KEYS[3], lruItem); " + - " redis.call('zrem', lastAccessTimeSetName, lruItem); " + - " local removedChannelName = KEYS[6]; " + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + - " redis.call('publish', removedChannelName, msg); " + + " if lruItemValue ~= false then " + + " redis.call('hdel', KEYS[1], lruItem); " + + " redis.call('zrem', KEYS[2], lruItem); " + + " redis.call('zrem', KEYS[3], lruItem); " + + " redis.call('zrem', lastAccessTimeSetName, lruItem); " + + " local removedChannelName = KEYS[6]; " + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue); " + + " redis.call('publish', removedChannelName, msg); " + + "end; " + " end; " + " end; " + " end; " + @@ -1720,13 +1738,15 @@ public class RedissonMapCache extends RedissonMap implements RMapCac " for index, lruItem in ipairs(lruItems) do" + " if lruItem then" + " local lruItemValue = redis.call('hget', KEYS[1], lruItem);" + - " redis.call('hdel', KEYS[1], lruItem);" + - " redis.call('zrem', KEYS[2], lruItem);" + - " redis.call('zrem', KEYS[3], lruItem);" + - " redis.call('zrem', lastAccessTimeSetName, lruItem);" + - " local removedChannelName = KEYS[7];" + - " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" + - " redis.call('publish', removedChannelName, msg);" + + " if lruItemValue ~= false then " + + " redis.call('hdel', KEYS[1], lruItem);" + + " redis.call('zrem', KEYS[2], lruItem);" + + " redis.call('zrem', KEYS[3], lruItem);" + + " redis.call('zrem', lastAccessTimeSetName, lruItem);" + + " local removedChannelName = KEYS[7];" + + " local msg = struct.pack('Lc0Lc0', string.len(lruItem), lruItem, string.len(lruItemValue), lruItemValue);" + + " redis.call('publish', removedChannelName, msg);" + + "end; " + " end;" + " end" + " end;" +