Merge branch 'main' into marc/get-server-keyed

Author: mgravell

docs/ReleaseNotes.md

@@ -14,6 +14,7 @@ Current package versions:
 - Add support for XPENDING Idle time filter ([#2822 by david-brink-talogy](https://github.com/StackExchange/StackExchange.Redis/pull/2822))
 - Improve `double` formatting performance on net8+ ([#2928 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2928))
 - Add `GetServer(RedisKey, ...)` API ([#2936 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2936))
+- Fix error constructing `StreamAdd` message ([#2941 by mgravell](https://github.com/StackExchange/StackExchange.Redis/pull/2941)) 
 
 ## 2.8.58
 

src/StackExchange.Redis/RedisDatabase.cs

@@ -4598,13 +4598,12 @@ private Message GetStreamAddMessage(RedisKey key, RedisValue entryId, long? maxL
                 throw new ArgumentOutOfRangeException(nameof(maxLength), "maxLength must be greater than 0.");
             }
 
-            var includeMaxLen = maxLength.HasValue ? 2 : 0;
-            var includeApproxLen = maxLength.HasValue && useApproximateMaxLength ? 1 : 0;
-
             var totalLength = (streamPairs.Length * 2) // Room for the name/value pairs
-                                + 1 // The stream entry ID
-                                + includeMaxLen // 2 or 0 (MAXLEN keyword & the count)
-                                + includeApproxLen;        // 1 or 0
+                + 1 // The stream entry ID
+                + (maxLength.HasValue ? 2 : 0) // MAXLEN N
+                + (maxLength.HasValue && useApproximateMaxLength ? 1 : 0) // ~
+                + (mode == StreamTrimMode.KeepReferences ? 0 : 1) // relevant trim-mode keyword
+                + (limit.HasValue ? 2 : 0); // LIMIT N
 
             var values = new RedisValue[totalLength];
 

tests/RedisConfigs/.docker/Redis/Dockerfile

@@ -1,4 +1,4 @@
-FROM redis:7.4.2
+FROM redis:8.2.0
 
 COPY --from=configs ./Basic /data/Basic/
 COPY --from=configs ./Failover /data/Failover/

tests/StackExchange.Redis.Tests/AbortOnConnectFailTests.cs

@@ -81,16 +81,16 @@ public async Task DisconnectAndNoReconnectThrowsConnectionExceptionAsync()
     }
 
     private ConnectionMultiplexer GetFailFastConn() =>
-        ConnectionMultiplexer.Connect(GetOptions(BacklogPolicy.FailFast, 400).Apply(o => o.EndPoints.Add($"doesnot.exist.{Guid.NewGuid():N}:6379")), Writer);
+        ConnectionMultiplexer.Connect(GetOptions(BacklogPolicy.FailFast, duration: 400, connectTimeout: 500).Apply(o => o.EndPoints.Add($"doesnot.exist.{Guid.NewGuid():N}:6379")), Writer);
 
     private ConnectionMultiplexer GetWorkingBacklogConn() =>
-        ConnectionMultiplexer.Connect(GetOptions(BacklogPolicy.Default, 1000).Apply(o => o.EndPoints.Add(GetConfiguration())), Writer);
+        ConnectionMultiplexer.Connect(GetOptions(BacklogPolicy.Default).Apply(o => o.EndPoints.Add(GetConfiguration())), Writer);
 
-    private static ConfigurationOptions GetOptions(BacklogPolicy policy, int duration) => new ConfigurationOptions()
+    private static ConfigurationOptions GetOptions(BacklogPolicy policy, int duration = 1000, int connectTimeout = 2000) => new ConfigurationOptions()
     {
         AbortOnConnectFail = false,
         BacklogPolicy = policy,
-        ConnectTimeout = 500,
+        ConnectTimeout = connectTimeout,
         SyncTimeout = duration,
         KeepAlive = duration,
         AllowAdmin = true,

tests/StackExchange.Redis.Tests/KeyTests.cs

@@ -182,7 +182,7 @@ public async Task KeyEncoding()
         db.KeyDelete(key, CommandFlags.FireAndForget);
         db.StringSet(key, "new value", flags: CommandFlags.FireAndForget);
 
-        Assert.True(db.KeyEncoding(key) is "embstr" or "raw");
+        Assert.True(db.KeyEncoding(key) is "embstr" or "raw"); // server-version dependent
         Assert.True(await db.KeyEncodingAsync(key) is "embstr" or "raw");
 
         db.KeyDelete(key, CommandFlags.FireAndForget);

tests/StackExchange.Redis.Tests/StreamTests.cs

@@ -2155,6 +2155,28 @@ public async Task AddWithApproxCount(StreamTrimMode mode)
         db.StreamAdd(key, "field", "value", maxLength: 10, useApproximateMaxLength: true, trimMode: mode, flags: CommandFlags.None);
     }
 
+    [Theory]
+    [InlineData(StreamTrimMode.KeepReferences, 1)]
+    [InlineData(StreamTrimMode.DeleteReferences, 1)]
+    [InlineData(StreamTrimMode.Acknowledged, 1)]
+    [InlineData(StreamTrimMode.KeepReferences, 2)]
+    [InlineData(StreamTrimMode.DeleteReferences, 2)]
+    [InlineData(StreamTrimMode.Acknowledged, 2)]
+    public async Task AddWithMultipleApproxCount(StreamTrimMode mode, int count)
+    {
+        await using var conn = Create(require: ForMode(mode));
+
+        var db = conn.GetDatabase();
+        var key = Me() + ":" + mode;
+
+        var pairs = new NameValueEntry[count];
+        for (var i = 0; i < count; i++)
+        {
+            pairs[i] = new NameValueEntry($"field{i}", $"value{i}");
+        }
+        db.StreamAdd(key, maxLength: 10, useApproximateMaxLength: true, trimMode: mode, flags: CommandFlags.None, streamPairs: pairs);
+    }
+
     [Fact]
     public async Task StreamReadGroupWithNoAckShowsNoPendingMessages()
     {