Collapse nearly identical SendReceiveVoid into SendReceive with action func hacks

Author: mythz

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -400,13 +400,13 @@ private void PushCurrentBuffer()
 
         public Action OnBeforeFlush { get; set; }
 
-        public void FlushAndResetSendBuffer()
+        internal void FlushAndResetSendBuffer()
         {
             FlushSendBuffer();
             ResetSendBuffer();
         }
 
-        public void FlushSendBuffer()
+        internal void FlushSendBuffer()
         {
             if (currentBufferIndex > 0)
                 PushCurrentBuffer();
@@ -458,7 +458,10 @@ private int SafeReadByte()
             return Bstream.ReadByte();
         }
 
-        protected T SendReceive<T>(byte[][] cmdWithBinaryArgs, Func<T> fn, Action<Func<T>> completePipelineFn = null)
+        protected T SendReceive<T>(byte[][] cmdWithBinaryArgs, 
+            Func<T> fn, 
+            Action<Func<T>> completePipelineFn = null, 
+            bool sendWithoutRead = false)
         {
             var i = 0;
             Exception originalEx = null;
@@ -478,7 +481,7 @@ protected T SendReceive<T>(byte[][] cmdWithBinaryArgs, Func<T> fn, Action<Func<T
                     {
                         FlushSendBuffer();
                     }
-                    else
+                    else if (!sendWithoutRead)
                     {
                         if (completePipelineFn == null)
                             throw new NotSupportedException("Pipeline is not supported.");
@@ -487,12 +490,15 @@ protected T SendReceive<T>(byte[][] cmdWithBinaryArgs, Func<T> fn, Action<Func<T
                         return default(T);
                     }
 
-                    var result = fn();
+                    var result = default(T);
+                    if (fn != null)
+                        result = fn();
 
                     if (Pipeline == null)
-                    {
                         ResetSendBuffer();
-                    }
+
+                    if (i > 0)
+                        Interlocked.Increment(ref RedisState.TotalRetrySuccess);
 
                     return result;
                 }
@@ -512,70 +518,15 @@ protected T SendReceive<T>(byte[][] cmdWithBinaryArgs, Func<T> fn, Action<Func<T
 
                     var retry = DateTime.UtcNow - firstAttempt < retryTimeout;
                     if (!retry)
-                        throw CreateRetryTimeoutException(retryTimeout, originalEx);
-
-                    Thread.Sleep(GetBackOffMultiplier(++i));
-                }
-            }
-        }
-
-        protected void SendReceiveVoid(byte[][] cmdWithBinaryArgs, Action fn, Action<Action> completePipelineFn, bool sendWithoutRead = false)
-        {
-            var i = 0;
-            Exception originalEx = null;
-
-            var firstAttempt = DateTime.UtcNow;
-
-            while (true)
-            {
-                try
-                {
-                    TryConnectIfNeeded();
-
-                    if (i == 0) //only write to buffer once
-                        WriteCommandToSendBuffer(cmdWithBinaryArgs);
-
-                    if (Pipeline == null) //pipeline will handle flush if in pipeline
-                    {
-                        FlushSendBuffer();
-                    }
-                    else if (!sendWithoutRead)
-                    {
-                        if (completePipelineFn == null)
-                            throw new NotSupportedException("Pipeline is not supported.");
-
-                        completePipelineFn(fn);
-                        return;
-                    }
-
-                    if (fn != null)
-                        fn();
-
-                    if (Pipeline == null)
                     {
-                        ResetSendBuffer();
-                    }
-
-                    return;
-                }
-                catch (Exception outerEx)
-                {
-                    var retryableEx = outerEx as RedisRetryableException;
+                        if (Pipeline == null)
+                            ResetSendBuffer();
 
-                    if (outerEx is RedisException && retryableEx == null)
-                        throw;
-
-                    var ex = retryableEx ?? GetRetryableException(outerEx);
-                    if (ex == null)
-                        throw CreateConnectionError();
-
-                    if (originalEx == null)
-                        originalEx = ex;
-
-                    var retry = DateTime.UtcNow - firstAttempt < retryTimeout;
-                    if (!retry)
+                        Interlocked.Increment(ref RedisState.TotalRetryTimedout);
                         throw CreateRetryTimeoutException(retryTimeout, originalEx);
+                    }
 
+                    Interlocked.Increment(ref RedisState.TotalRetryCount);
                     Thread.Sleep(GetBackOffMultiplier(++i));
                 }
             }
@@ -616,12 +567,17 @@ private static int GetBackOffMultiplier(int i)
 
         protected void SendWithoutRead(params byte[][] cmdWithBinaryArgs)
         {
-            SendReceiveVoid(cmdWithBinaryArgs, null, null, sendWithoutRead: true);
+            SendReceive<long>(cmdWithBinaryArgs, null, null, sendWithoutRead: true);
         }
 
         protected void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)
         {
-            SendReceiveVoid(cmdWithBinaryArgs, ExpectSuccess, Pipeline != null ? Pipeline.CompleteVoidQueuedCommand : (Action<Action>)null);
+            //Turn Action into Func Hack
+            var completePipelineFn = Pipeline != null
+                ? f => { Pipeline.CompleteVoidQueuedCommand(() => f()); }
+            : (Action<Func<long>>)null;
+
+            SendReceive(cmdWithBinaryArgs, ExpectSuccessFn, completePipelineFn);
         }
 
         protected long SendExpectLong(params byte[][] cmdWithBinaryArgs)
@@ -699,6 +655,13 @@ protected void CmdLog(byte[][] args)
             log.Debug("S: " + this.lastCommand);
         }
 
+        //Turn Action into Func Hack
+        protected long ExpectSuccessFn()
+        {
+            ExpectSuccess();
+            return 0;
+        }
+
         protected void ExpectSuccess()
         {
             int c = SafeReadByte();