don't allow composite ops in Pipelines either

mythz · mythz · commit e47dcccbcb10 · 2018-11-26T19:46:31.000+08:00
diff --git a/src/ServiceStack.Redis/RedisClient.cs b/src/ServiceStack.Redis/RedisClient.cs
@@ -401,7 +401,7 @@ public IRedisTransaction CreateTransaction()
 
         public void AssertNotInTransaction()
         {
-            if (Transaction != null)
+            if (Transaction != null || Pipeline != null)
                 throw new NotSupportedException("Only atomic redis-server operations are supported in a transaction");
         }
 
diff --git a/tests/ServiceStack.Redis.Tests/Issues/PipelineIssueTests.cs b/tests/ServiceStack.Redis.Tests/Issues/PipelineIssueTests.cs
@@ -61,7 +61,6 @@ public void Can_Set_with_DateTime_in_Pipeline()
 
                     using (var pipeline = redis.CreatePipeline())
                     {
-
                         pipeline.QueueCommand(r => r.Set(key, value), r => result = r);
                         pipeline.QueueCommand(r => r.ExpireEntryAt(key, DateTime.Now.AddMinutes(1)));
                         

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ public IRedisTransaction CreateTransaction()`
`401`	`401`
`402`	`402`	`public void AssertNotInTransaction()`
`403`	`403`	`{`
`404`		`- if (Transaction != null)`
	`404`	`+ if (Transaction != null \|\| Pipeline != null)`
`405`	`405`	`throw new NotSupportedException("Only atomic redis-server operations are supported in a transaction");`
`406`	`406`	`}`
`407`	`407`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public void Can_Set_with_DateTime_in_Pipeline()`
`61`	`61`
`62`	`62`	`using (var pipeline = redis.CreatePipeline())`
`63`	`63`	`{`
`64`		`-`
`65`	`64`	`pipeline.QueueCommand(r => r.Set(key, value), r => result = r);`
`66`	`65`	`pipeline.QueueCommand(r => r.ExpireEntryAt(key, DateTime.Now.AddMinutes(1)));`
`67`	`66`