Pipeline and multi key operations only counts as 1 test

Author: mythz

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -150,8 +150,12 @@ internal IRedisPipelineShared Pipeline
         internal void EndPipeline()
         {
             ResetSendBuffer();
-            Pipeline = null;
-            Interlocked.Increment(ref __requestsPerHour);
+
+            if (Pipeline != null)
+            {
+                Pipeline = null;
+                Interlocked.Increment(ref __requestsPerHour);
+            }
         }
 
         public RedisNativeClient(string connectionString)

tests/ServiceStack.Redis.Tests/RedisStatsTests.cs

@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace ServiceStack.Redis.Tests
+{
+    [TestFixture]
+    public class RedisStatsTests
+        : RedisClientTestsBase
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            RedisConfig.AssumeServerVersion = 2821;
+        }
+
+        [Test]
+        [Explicit]
+        public void Batch_and_Pipeline_requests_only_counts_as_1_request()
+        {
+            var reqCount = RedisNativeClient.RequestsPerHour;
+
+            var map = new Dictionary<string,string>();
+            10.Times(i => map["key" + i] = "value" + i);
+
+            Redis.SetValues(map);
+
+            Assert.That(RedisNativeClient.RequestsPerHour, Is.EqualTo(reqCount + 1));
+
+            var keyTypes = new Dictionary<string, string>();
+            using (var pipeline = Redis.CreatePipeline())
+            {
+                map.Keys.Each(key =>
+                    pipeline.QueueCommand(r => r.Type(key), x => keyTypes[key] = x));
+
+                pipeline.Flush();
+            }
+
+            Assert.That(RedisNativeClient.RequestsPerHour, Is.EqualTo(reqCount + 2));
+            Assert.That(keyTypes.Count, Is.EqualTo(map.Count));
+        }
+    }
+}

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

@@ -250,6 +250,7 @@
     <Compile Include="RedisPubSubServerTests.cs" />
     <Compile Include="RedisPubSubTests.cs" />
     <Compile Include="RedisScanTests.cs" />
+    <Compile Include="RedisStatsTests.cs" />
     <Compile Include="RedisTransactionCommonTests.cs" />
     <Compile Include="RedisTransactionTests.cs" />
     <Compile Include="RedisUtilTests.cs" />