Change Sentinels to parse complex response using RedisData instead of Nested late-bound objects

Author: mythz

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -1515,36 +1515,14 @@ public byte[] BRPopLPush(string fromListId, string toListId, int timeOutSecs)
 
         #region Sentinel
 
-        private static Dictionary<string, string> ToDictionary(object[] result)
-        {
-            var map = new Dictionary<string, string>();
-
-            string key = null;
-            for (var i = 0; i < result.Length; i++)
-            {
-                var bytes = (byte[])result[i];
-                if (i % 2 == 0)
-                {
-                    key = bytes.FromUtf8Bytes();
-                }
-                else
-                {
-                    var val = bytes.FromUtf8Bytes();
-                    map[key] = val;
-                }
-            }
-            return map;
-        }
-
         public List<Dictionary<string, string>> SentinelMasters()
         {
             var args = new List<byte[]>
             {
                 Commands.Sentinel,
                 Commands.Masters,
             };
-            var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return ToDictionaryList(results);
+            return SendExpectStringDictionaryList(args.ToArray());
         }
 
         public Dictionary<string, string> SentinelMaster(string masterName)
@@ -1555,7 +1533,7 @@ public Dictionary<string, string> SentinelMaster(string masterName)
                 Commands.Master,
                 masterName.ToUtf8Bytes(),
             };
-            var results = SendExpectDeeplyNestedMultiData(args.ToArray());
+            var results = SendExpectComplexResponse(args.ToArray());
             return ToDictionary(results);
         }
 
@@ -1567,8 +1545,7 @@ public List<Dictionary<string, string>> SentinelSentinels(string masterName)
                 Commands.Sentinels,
                 masterName.ToUtf8Bytes(),
             };
-            var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return ToDictionaryList(results);
+            return SendExpectStringDictionaryList(args.ToArray());
         }
 
         public List<Dictionary<string, string>> SentinelSlaves(string masterName)
@@ -1579,33 +1556,7 @@ public List<Dictionary<string, string>> SentinelSlaves(string masterName)
                 Commands.Slaves,
                 masterName.ToUtf8Bytes(),
             };
-            var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return ToDictionaryList(results);
-        }
-
-        private static List<Dictionary<string, string>> ToDictionaryList(object[] results)
-        {
-            var to = new List<Dictionary<string, string>>();
-            foreach (object result in results)
-            {
-                var obArray = result as object[];
-                if (obArray == null)
-                {
-                    var value = result.ToString();
-                    var bytes = result as byte[];
-                    if (bytes != null)
-                        value = bytes.FromUtf8Bytes();
-
-                    log.ErrorFormat("[{0}] Expected object[] received {1}: {2}",
-                        DateTime.UtcNow.ToString("HH:mm:ss.fff"), result.GetType().Name, value);
-
-                    continue;
-                }
-
-                var item = ToDictionary(obArray);
-                to.Add(item);
-            }
-            return to;
+            return SendExpectStringDictionaryList(args.ToArray());
         }
 
         public List<string> SentinelGetMasterAddrByName(string masterName)
@@ -1616,7 +1567,6 @@ public List<string> SentinelGetMasterAddrByName(string masterName)
                 Commands.GetMasterAddrByName,
                 masterName.ToUtf8Bytes(),
             };
-
             return SendExpectMultiData(args.ToArray()).ToStringList();
         }
 

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -154,7 +154,6 @@ private void Connect()
                     {
                         ServerVersionNumber = RedisConfig.AssumeServerVersion.GetValueOrDefault(0);
                         if (ServerVersionNumber <= 0)
-                        { 
                         {
                             var parts = ServerVersion.Split('.');
                             var version = int.Parse(parts[0]) * 1000;
@@ -670,6 +669,48 @@ protected RedisData SendExpectComplexResponse(params byte[][] cmdWithBinaryArgs)
             return SendReceive(cmdWithBinaryArgs, ReadComplexResponse, Pipeline != null ? Pipeline.CompleteRedisDataQueuedCommand : (Action<Func<RedisData>>)null);
         }
 
+        protected List<Dictionary<string, string>> SendExpectStringDictionaryList(params byte[][] cmdWithBinaryArgs)
+        {
+            var results = SendExpectComplexResponse(cmdWithBinaryArgs);
+            var to = new List<Dictionary<string, string>>();
+            foreach (var data in results.Children)
+            {
+                if (data.Children != null)
+                {
+                    var map = ToDictionary(data);
+                    to.Add(map);
+                }
+            }
+            return to;
+        }
+
+        private static Dictionary<string, string> ToDictionary(RedisData data)
+        {
+            string key = null;
+            var map = new Dictionary<string, string>();
+
+            if (data.Children == null)
+                throw new ArgumentNullException("data.Children");
+
+            for (var i = 0; i < data.Children.Count; i++)
+            {
+                var bytes = data.Children[i].Data;
+                if (i % 2 == 0)
+                {
+                    key = bytes.FromUtf8Bytes();
+                }
+                else
+                {
+                    if (key == null)
+                        throw new RedisResponseException("key == null, i={0}, data.Children[i] = {1}".Fmt(i, data.Children[i].ToRedisText().Dump()));
+
+                    var val = bytes.FromUtf8Bytes();
+                    map[key] = val;
+                }
+            }
+            return map;
+        }
+
         protected string SendExpectString(params byte[][] cmdWithBinaryArgs)
         {
             var bytes = SendExpectData(cmdWithBinaryArgs);