re-factor Set methods and add tests

Author: mythz

src/ServiceStack.Redis/RedisClient.cs

@@ -126,14 +126,20 @@ public void SetEntry(string key, string value, TimeSpan expireIn)
         {
             var bytesValue = value != null ? value.ToUtf8Bytes() : null;
 
-            base.Set(key, bytesValue, (int)expireIn.TotalSeconds, expireIn.Milliseconds);
+            if (expireIn.Milliseconds > 0)
+                base.Set(key, bytesValue, 0, (long)expireIn.TotalMilliseconds);
+            else
+                base.Set(key, bytesValue, (int)expireIn.TotalSeconds, 0);
         }
 
         public void SetEntryIfExists(string key, string value, TimeSpan expireIn)
         {
             var bytesValue = value != null ? value.ToUtf8Bytes() : null;
 
-            base.Set(key, bytesValue, (int)expireIn.TotalSeconds, expireIn.Milliseconds, exists:true);
+            if (expireIn.Milliseconds > 0)
+                base.Set(key, bytesValue, 0, (long)expireIn.TotalMilliseconds, exists: true);
+            else
+                base.Set(key, bytesValue, (int)expireIn.TotalSeconds, 0, exists: true);
         }
 
         public bool SetEntryIfNotExists(string key, string value)
@@ -148,7 +154,10 @@ public void SetEntryIfNotExists(string key, string value, TimeSpan expireIn)
         {
             var bytesValue = value != null ? value.ToUtf8Bytes() : null;
 
-            base.Set(key, bytesValue, (int)expireIn.TotalSeconds, expireIn.Milliseconds, exists: false);
+            if (expireIn.Milliseconds > 0)
+                base.Set(key, bytesValue, 0, (long)expireIn.TotalMilliseconds, exists: false);
+            else
+                base.Set(key, bytesValue, (int)expireIn.TotalSeconds, 0, exists: false);
         }
 
         public void ChangeDb(long db)

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -338,18 +338,23 @@ public void Set(string key, byte[] value, int expirySeconds, long expiryMs = 0,
 
             if (exists == null)
             {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value,
-                    Commands.Ex, expirySeconds.ToUtf8Bytes(),
-                    Commands.Px, expiryMs.ToUtf8Bytes());
+                if (expirySeconds > 0)
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.Ex, expirySeconds.ToUtf8Bytes());
+                else if (expiryMs > 0)
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.Px, expiryMs.ToUtf8Bytes());
+                else
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value);
             }
             else
             {
                 var entryExists = exists.Value ? Commands.Xx : Commands.Nx;
 
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value,
-                    Commands.Ex, expirySeconds.ToUtf8Bytes(),
-                    Commands.Px, expiryMs.ToUtf8Bytes(), 
-                    entryExists);                
+                if (expirySeconds > 0)
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.Ex, expirySeconds.ToUtf8Bytes(), entryExists);
+                else if (expiryMs > 0)
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.Px, expiryMs.ToUtf8Bytes(), entryExists);
+                else
+                    SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, entryExists);
             }
         }
 

tests/ServiceStack.Redis.Tests/RedisClientTests.cs

@@ -557,6 +557,52 @@ public void Can_change_db_at_runtime()
                 }
             }
         }
-	}
+
+        [Test]
+        public void Can_Set_Expire_Seconds()
+        {
+            Redis.SetEntry("key", "val", expireIn: TimeSpan.FromSeconds(1));
+            Assert.That(Redis.ContainsKey("key"), Is.True);
+            Thread.Sleep(2000);
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+        }
+
+        [Test]
+        public void Can_Set_Expire_MilliSeconds()
+        {
+            Redis.SetEntry("key", "val", expireIn: TimeSpan.FromMilliseconds(1000));
+            Assert.That(Redis.ContainsKey("key"), Is.True);
+            Thread.Sleep(2000);
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+        }
+
+        [Test]
+        public void Can_Set_Expire_Seconds_if_exists()
+        {
+            Redis.SetEntryIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1500));
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+
+            Redis.SetEntry("key", "val");
+            Redis.SetEntryIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000));
+            Assert.That(Redis.ContainsKey("key"), Is.True);
+
+            Thread.Sleep(2000);
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+        }
+
+        [Test]
+        public void Can_Set_Expire_Seconds_if_not_exists()
+        {
+            Redis.SetEntryIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000));
+            Assert.That(Redis.ContainsKey("key"), Is.True);
+
+            Thread.Sleep(2000);
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+
+            Redis.Remove("key");
+            Redis.SetEntryIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000));
+            Assert.That(Redis.ContainsKey("key"), Is.False);
+        }
+    }
 
 }