Refactored RedisNativeClient to use RedisDataExtensions methods for parsing RedisData.

Added ToDouble and ToInt64 to RedisDataExtensions in order to parse RedisData.

Author: xperiandri

src/ServiceStack.Redis/RedisDataExtensions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace ServiceStack.Redis
 {
@@ -19,28 +20,28 @@ public static RedisText ToRedisText(this RedisData data)
             return to;
         }
 
-        public static string GetResult(this RedisText from)
-        {
-            return from.Text;
-        }
+        public static double ToDouble(this RedisData data)
+            => double.Parse(data.Data.FromUtf8Bytes(),
+                            NumberStyles.Float,
+                            CultureInfo.InvariantCulture);
 
-        public static T GetResult<T>(this RedisText from)
-        {
-            return from.Text.FromJson<T>();
-        }
+        public static long ToInt64(this RedisData data)
+            => long.Parse(data.Data.FromUtf8Bytes(),
+                          NumberStyles.Integer,
+                          CultureInfo.InvariantCulture);
+
+        public static string GetResult(this RedisText from) => from.Text;
+
+        public static T GetResult<T>(this RedisText from) => from.Text.FromJson<T>();
 
         public static List<string> GetResults(this RedisText from)
-        {
-            return from.Children == null
-                ? new List<string>()
-                : from.Children.ConvertAll(x => x.Text);
-        }
+            => from.Children == null
+               ? new List<string>()
+               : from.Children.ConvertAll(x => x.Text);
 
         public static List<T> GetResults<T>(this RedisText from)
-        {
-            return from.Children == null
-                ? new List<T>()
-                : from.Children.ConvertAll(x => x.Text.FromJson<T>());
-        }
+            => from.Children == null
+               ? new List<T>()
+               : from.Children.ConvertAll(x => x.Text.FromJson<T>());
     }
 }

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -2236,17 +2236,15 @@ public List<RedisGeo> GeoPos(string key, params string[] members)
                     break;
 
                 var entry = data.Children[i];
-                if (entry.Children.Count == 0)
+
+                var children = entry.Children;
+                if (children.Count == 0)
                     continue;
 
                 to.Add(new RedisGeo
                 {
-                    Longitude = double.Parse(entry.Children[0].Data.FromUtf8Bytes(),
-                                             NumberStyles.Float,
-                                             CultureInfo.InvariantCulture),
-                    Latitude  = double.Parse(entry.Children[1].Data.FromUtf8Bytes(),
-                                             NumberStyles.Float,
-                                             CultureInfo.InvariantCulture),
+                    Longitude = children[0].ToDouble(),
+                    Latitude  = children[1].ToDouble(),
                     Member = members[i],
                 });
             }
@@ -2307,24 +2305,15 @@ public List<RedisGeoResult> GeoRadius(string key, double longitude, double latit
                     var i = 0;
                     var result = new RedisGeoResult { Unit = unit, Member = child.Children[i++].Data.FromUtf8Bytes() };
 
-                    if (withDist)
-                        result.Distance = double.Parse(child.Children[i++].Data.FromUtf8Bytes(),
-                                                       NumberStyles.Float,
-                                                       CultureInfo.InvariantCulture);
+                    if (withDist) result.Distance = child.Children[i++].ToDouble();
 
-                    if (withHash)
-                        result.Hash = long.Parse(child.Children[i++].Data.FromUtf8Bytes(),
-                                                 NumberStyles.Integer,
-                                                 CultureInfo.InvariantCulture);
+                    if (withHash) result.Hash = child.Children[i++].ToInt64();
 
                     if (withCoords)
                     {
-                        result.Longitude = double.Parse(child.Children[i].Children[0].Data.FromUtf8Bytes(),
-                                                        NumberStyles.Float,
-                                                        CultureInfo.InvariantCulture);
-                        result.Latitude  = double.Parse(child.Children[i].Children[1].Data.FromUtf8Bytes(),
-                                                        NumberStyles.Float,
-                                                        CultureInfo.InvariantCulture);
+                        var children = child.Children[i].Children;
+                        result.Longitude = children[0].ToDouble();
+                        result.Latitude  = children[1].ToDouble();
                     }
 
                     to.Add(result);
@@ -2386,24 +2375,15 @@ public List<RedisGeoResult> GeoRadiusByMember(string key, string member, double
                     var i = 0;
                     var result = new RedisGeoResult { Unit = unit, Member = child.Children[i++].Data.FromUtf8Bytes() };
 
-                    if (withDist)
-                        result.Distance = double.Parse(child.Children[i++].Data.FromUtf8Bytes(),
-                                                       NumberStyles.Float,
-                                                       CultureInfo.InvariantCulture);
+                    if (withDist) result.Distance = child.Children[i++].ToDouble();
 
-                    if (withHash)
-                        result.Hash = long.Parse(child.Children[i++].Data.FromUtf8Bytes(),
-                                                 NumberStyles.Integer,
-                                                 CultureInfo.InvariantCulture);
+                    if (withHash) result.Hash = child.Children[i++].ToInt64();
 
                     if (withCoords)
                     {
-                        result.Longitude = double.Parse(child.Children[i].Children[0].Data.FromUtf8Bytes(),
-                                                        NumberStyles.Float,
-                                                        CultureInfo.InvariantCulture);
-                        result.Latitude  = double.Parse(child.Children[i].Children[1].Data.FromUtf8Bytes(),
-                                                        NumberStyles.Float,
-                                                        CultureInfo.InvariantCulture);
+                        var children = child.Children[i].Children;
+                        result.Longitude = children[0].ToDouble();
+                        result.Latitude  = children[1].ToDouble();
                     }
 
                     to.Add(result);

src/ServiceStack.Redis/ScanResult.cs

@@ -16,9 +16,7 @@ public static Dictionary<string, double> AsItemsWithScores(this ScanResult resul
             for (var i = 0; i < result.Results.Count; i += 2)
             {
                 var key = result.Results[i];
-                var score = double.Parse(result.Results[i + 1].FromUtf8Bytes(),
-                                         NumberStyles.Float,
-                                         CultureInfo.InvariantCulture);
+                var score = result.Results[i + 1].ToDouble();
                 to[key.FromUtf8Bytes()] = score;
             }
             return to;