integration tests for subkey notifications (something channel-routing related still failing)

mgravell · mgravell · commit 5f26a0526455 · 2026-04-24T11:12:13.000+01:00
diff --git a/src/StackExchange.Redis/KeyNotification.SubKeys.cs b/src/StackExchange.Redis/KeyNotification.SubKeys.cs
@@ -320,8 +320,8 @@ internal bool TryMoveNext(bool setCurrent)
                     var valueLength = (int)value.Length();
                     _position += colonIndex + 1 + valueLength;
 
-                    // Skip the | separator if present
-                    if (_position < _data.Length && _data[_position] == (byte)'|')
+                    // Skip the separator if present (| or ,)
+                    if (_position < _data.Length && (_data[_position] == (byte)'|' || _data[_position] == (byte)','))
                     {
                         _position++;
                     }
diff --git a/tests/RedisConfigs/Basic/primary-6379.conf b/tests/RedisConfigs/Basic/primary-6379.conf
@@ -8,4 +8,4 @@ appendonly no
 dbfilename "primary-6379.rdb"
 save ""
 enable-debug-command yes
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Basic/replica-6380.conf b/tests/RedisConfigs/Basic/replica-6380.conf
@@ -8,4 +8,4 @@ appendonly no
 dir "../Temp"
 dbfilename "replica-6380.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Basic/secure-6381.conf b/tests/RedisConfigs/Basic/secure-6381.conf
@@ -5,4 +5,4 @@ maxmemory 512mb
 dir "../Temp"
 dbfilename "secure-6381.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Basic/tls-ciphers-6384.conf b/tests/RedisConfigs/Basic/tls-ciphers-6384.conf
@@ -9,4 +9,4 @@ tls-protocols "TLSv1.2 TLSv1.3"
 tls-cert-file /Certs/redis.crt
 tls-key-file /Certs/redis.key
 tls-ca-cert-file /Certs/ca.crt
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7000.conf b/tests/RedisConfigs/Cluster/cluster-7000.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7000.rdb"
 appendfilename "appendonly-7000.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7001.conf b/tests/RedisConfigs/Cluster/cluster-7001.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7001.rdb"
 appendfilename "appendonly-7001.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7002.conf b/tests/RedisConfigs/Cluster/cluster-7002.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7002.rdb"
 appendfilename "appendonly-7002.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7003.conf b/tests/RedisConfigs/Cluster/cluster-7003.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7003.rdb"
 appendfilename "appendonly-7003.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7004.conf b/tests/RedisConfigs/Cluster/cluster-7004.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7004.rdb"
 appendfilename "appendonly-7004.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Cluster/cluster-7005.conf b/tests/RedisConfigs/Cluster/cluster-7005.conf
@@ -7,4 +7,4 @@ appendonly yes
 dbfilename "dump-7005.rdb"
 appendfilename "appendonly-7005.aof"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Failover/primary-6382.conf b/tests/RedisConfigs/Failover/primary-6382.conf
@@ -7,4 +7,4 @@ dir "../Temp"
 appendonly no
 dbfilename "primary-6382.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Failover/replica-6383.conf b/tests/RedisConfigs/Failover/replica-6383.conf
@@ -8,4 +8,4 @@ appendonly no
 dir "../Temp"
 dbfilename "replica-6383.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Sentinel/redis-7010.conf b/tests/RedisConfigs/Sentinel/redis-7010.conf
@@ -6,4 +6,4 @@ appendonly no
 dir "../Temp"
 dbfilename "sentinel-target-7010.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/RedisConfigs/Sentinel/redis-7011.conf b/tests/RedisConfigs/Sentinel/redis-7011.conf
@@ -7,4 +7,4 @@ appendonly no
 dir "../Temp"
 dbfilename "sentinel-target-7011.rdb"
 save ""
-notify-keyspace-events AKE
+notify-keyspace-events AKESTIV
diff --git a/tests/StackExchange.Redis.Tests/KeyNotificationTests.cs b/tests/StackExchange.Redis.Tests/KeyNotificationTests.cs
@@ -1617,4 +1617,105 @@ public void SubKey_SubKeySpaceEvent_SubkeyNotAffectedByKeyPrefix()
         Assert.Equal("email:123456", (string?)subkey);
         Assert.Equal(12, subkey.GetByteCount());
     }
+
+    [Fact]
+    public void SubKeyEvent_MultipleFields_ParsesCorrectly()
+    {
+        // __subkeyevent@0__:hset with payload "1:k|6:field1,6:field2,6:field3"
+        // This represents an HSET on key "k" with fields "field1", "field2", "field3"
+        // Note: fields are separated by commas, not pipes (as per Redis 8.8 actual behavior)
+        var channel = RedisChannel.Literal("__subkeyevent@0__:hset");
+        RedisValue value = "1:k|6:field1,6:field2,6:field3";
+
+        log.WriteLine($"Testing channel: '{channel}', value: '{value}'");
+
+        Assert.True(KeyNotification.TryParse(in channel, in value, out var notification));
+
+        Assert.Equal(KeyNotificationKind.SubKeyEvent, notification.Kind);
+        Assert.Equal(0, notification.Database);
+        Assert.Equal(KeyNotificationType.HSet, notification.Type);
+        Assert.Equal("k", (string?)notification.GetKey());
+
+        // Test sub-keys
+        var subKeys = notification.GetSubKeys();
+        int count = subKeys.Count();
+        log.WriteLine($"Sub-key count: {count}");
+
+        Assert.Equal(3, count);
+
+        var fieldsList = subKeys.ToList();
+        Assert.Equal(3, fieldsList.Count);
+        Assert.Equal("field1", (string?)fieldsList[0]);
+        Assert.Equal("field2", (string?)fieldsList[1]);
+        Assert.Equal("field3", (string?)fieldsList[2]);
+    }
+
+    [Fact]
+    public void SubKeyEvent_RealWorldPayload_ParsesCorrectly()
+    {
+        // Real payload observed from Redis 8.8 server
+        var channel = RedisChannel.Literal("__subkeyevent@0__:hset");
+        RedisValue value = "41:d7213ec1-e834-4fb7-9a4d-a0d8d6bfbc7e/hash|6:field1,6:field2,6:field3";
+
+        Assert.True(KeyNotification.TryParse(in channel, in value, out var notification));
+
+        Assert.Equal(KeyNotificationKind.SubKeyEvent, notification.Kind);
+        Assert.Equal(0, notification.Database);
+        Assert.Equal(KeyNotificationType.HSet, notification.Type);
+        Assert.Equal("d7213ec1-e834-4fb7-9a4d-a0d8d6bfbc7e/hash", (string?)notification.GetKey());
+
+        // Test sub-keys
+        var subKeys = notification.GetSubKeys();
+        Assert.Equal(3, subKeys.Count());
+
+        var fieldsList = subKeys.ToArray();
+        Assert.Equal("field1", (string?)fieldsList[0]);
+        Assert.Equal("field2", (string?)fieldsList[1]);
+        Assert.Equal("field3", (string?)fieldsList[2]);
+    }
+
+    [Fact]
+    public void SubKeySpace_MultipleFields_ParsesCorrectly()
+    {
+        // __subkeyspace@0__:mykey with payload "4:hset|6:field1,6:field2"
+        var channel = RedisChannel.Literal("__subkeyspace@0__:mykey");
+        RedisValue value = "4:hset|6:field1,6:field2";
+
+        Assert.True(KeyNotification.TryParse(in channel, in value, out var notification));
+
+        Assert.Equal(KeyNotificationKind.SubKeySpace, notification.Kind);
+        Assert.Equal(0, notification.Database);
+        Assert.Equal(KeyNotificationType.HSet, notification.Type);
+        Assert.Equal("mykey", (string?)notification.GetKey());
+
+        var subKeys = notification.GetSubKeys();
+        Assert.Equal(2, subKeys.Count());
+
+        var fieldsList = subKeys.ToArray();
+        Assert.Equal("field1", (string?)fieldsList[0]);
+        Assert.Equal("field2", (string?)fieldsList[1]);
+    }
+
+    [Fact]
+    public void SubKeySpaceEvent_MultipleFields_ParsesCorrectly()
+    {
+        // __subkeyspaceevent@0__:hset|mykey with payload "6:field1,6:field2,6:field3"
+        var channel = RedisChannel.Literal("__subkeyspaceevent@0__:hset|mykey");
+        RedisValue value = "6:field1,6:field2,6:field3";
+
+        Assert.True(KeyNotification.TryParse(in channel, in value, out var notification));
+
+        Assert.Equal(KeyNotificationKind.SubKeySpaceEvent, notification.Kind);
+        Assert.Equal(0, notification.Database);
+        Assert.Equal(KeyNotificationType.HSet, notification.Type);
+        Assert.Equal("mykey", (string?)notification.GetKey());
+
+        var subKeys = notification.GetSubKeys();
+        Assert.Equal(3, subKeys.Count());
+
+        var fieldsList = subKeys.ToArray();
+        Assert.Equal("field1", (string?)fieldsList[0]);
+        Assert.Equal("field2", (string?)fieldsList[1]);
+        Assert.Equal("field3", (string?)fieldsList[2]);
+    }
 }
diff --git a/tests/StackExchange.Redis.Tests/PubSubKeyNotificationTests.cs b/tests/StackExchange.Redis.Tests/PubSubKeyNotificationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,8 @@ internal bool TryMoveNext(bool setCurrent)`
`320`	`320`	`var valueLength = (int)value.Length();`
`321`	`321`	`_position += colonIndex + 1 + valueLength;`
`322`	`322`
`323`		`- // Skip the \| separator if present`
`324`		`- if (_position < _data.Length && _data[_position] == (byte)'\|')`
	`323`	`+ // Skip the separator if present (\| or ,)`
	`324`	`+ if (_position < _data.Length && (_data[_position] == (byte)'\|' \|\| _data[_position] == (byte)','))`
`325`	`325`	`{`
`326`	`326`	`_position++;`
`327`	`327`	`}`