Improvement - the scope of key event subscriptions reduced for RLiveObjectService object. Now it uses key-space channel. #5180

redisson/src/main/java/org/redisson/RedissonLiveObjectService.java

@@ -73,12 +73,15 @@ public class RedissonLiveObjectService implements RLiveObjectService {
         this.seachEngine = new LiveObjectSearch(commandExecutor);
 
         if (commandExecutor.getServiceManager().getLiveObjectLatch().compareAndSet(false, true)) {
-            RPatternTopic topic = new RedissonPatternTopic(StringCodec.INSTANCE, commandExecutor, "__keyevent@*:expired");
+            String pp = "__keyspace@" + commandExecutor.getServiceManager().getConfig().getDatabase() + "__:redisson_live_object:*";
+            String prefix = pp.replace(":redisson_live_object:*", "");
+            RPatternTopic topic = new RedissonPatternTopic(StringCodec.INSTANCE, commandExecutor, pp);
             topic.addListenerAsync(String.class, (pattern, channel, msg) -> {
-                if (msg.contains("redisson_live_object:")) {
+                if (msg.equals("expired")) {
-                    Class<?> entity = resolveEntity(msg);
+                    String name = channel.toString().replace(prefix, "");
+                    Class<?> entity = resolveEntity(name);
                     NamingScheme scheme = commandExecutor.getObjectBuilder().getNamingScheme(entity);
-                    Object id = scheme.resolveId(msg);
+                    Object id = scheme.resolveId(name);
                     deleteExpired(id, entity);
                 }
             });

redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java

@@ -1727,7 +1727,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
                 .randomPort()
                 .randomDir()
                 .notifyKeyspaceEvents(
-                        RedisRunner.KEYSPACE_EVENTS_OPTIONS.E,
+                        RedisRunner.KEYSPACE_EVENTS_OPTIONS.K,
                         RedisRunner.KEYSPACE_EVENTS_OPTIONS.x)
                 .run();