re-factor Set methods always pass in 0 as default value

Author: mythz

src/ServiceStack.Redis/Commands.cs

@@ -175,9 +175,9 @@ public static class Commands
         public readonly static byte[] Flush = "FLUSH".ToUtf8Bytes();
         public readonly static byte[] Slowlog = "SLOWLOG".ToUtf8Bytes();
 
-        public readonly static byte[] ExpireInSeconds = "EX".ToUtf8Bytes();
-        public readonly static byte[] ExpireInMilliseconds = "PX".ToUtf8Bytes();
-        public readonly static byte[] SetIfKeyDoesNotExist = "NX".ToUtf8Bytes();
-        public readonly static byte[] SetIfKeyExists = "XX".ToUtf8Bytes();
+        public readonly static byte[] Ex = "EX".ToUtf8Bytes();
+        public readonly static byte[] Px = "PX".ToUtf8Bytes();
+        public readonly static byte[] Nx = "NX".ToUtf8Bytes();
+        public readonly static byte[] Xx = "XX".ToUtf8Bytes();
     }
 }

src/ServiceStack.Redis/RedisClient.cs

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

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -327,7 +327,7 @@ public void Set(string key, byte[] value)
             SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value);
         }
 
-    	public void Set(string key, byte[] value, int? expirySeconds = null, long? expiryMs = null, bool? exists = null)
+    	public void Set(string key, byte[] value, int expirySeconds, long expiryMs = 0, bool? exists = null)
         {
             if (key == null)
                 throw new ArgumentNullException("key");
@@ -336,29 +336,20 @@ public void Set(string key, byte[] value, int? expirySeconds = null, long? expir
             if (value.Length > OneGb)
                 throw new ArgumentException("value exceeds 1G", "value");
 
-            if (!expirySeconds.HasValue && !exists.HasValue)
+            if (exists == null)
             {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value);
+                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value,
+                    Commands.Ex, expirySeconds.ToUtf8Bytes(),
+                    Commands.Px, expiryMs.ToUtf8Bytes());
             }
-            else if (!exists.HasValue && expiryMs.HasValue)
-            {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.ExpireInMilliseconds, expiryMs.Value.ToUtf8Bytes());
-            }
-            else if (!exists.HasValue && expirySeconds.HasValue)
-            {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, Commands.ExpireInSeconds, expirySeconds.Value.ToUtf8Bytes());
-            }
-            else if (exists.HasValue && !expirySeconds.HasValue && !expiryMs.HasValue)
-            {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, exists.Value ? Commands.SetIfKeyExists : Commands.SetIfKeyDoesNotExist);
-            }
-            else if (exists.HasValue && expirySeconds.HasValue) 
-            {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, exists.Value ? Commands.SetIfKeyExists : Commands.SetIfKeyDoesNotExist, Commands.ExpireInSeconds, expirySeconds.Value.ToUtf8Bytes());
-            }
-            else if (exists.HasValue && expiryMs.HasValue) 
+            else
             {
-                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value, exists.Value ? Commands.SetIfKeyExists : Commands.SetIfKeyDoesNotExist, Commands.ExpireInMilliseconds, expiryMs.Value.ToUtf8Bytes());
+                var entryExists = exists.Value ? Commands.Xx : Commands.Nx;
+
+                SendExpectSuccess(Commands.Set, key.ToUtf8Bytes(), value,
+                    Commands.Ex, expirySeconds.ToUtf8Bytes(),
+                    Commands.Px, expiryMs.ToUtf8Bytes(), 
+                    entryExists);                
             }
         }