Fix multi get(#24)

Author: cnblogs-dudu

Enyim.Caching/IMemcachedClient.cs

@@ -15,7 +15,7 @@ public interface IMemcachedClient : IDisposable
         Task<T> GetValueAsync<T>(string key);
         object Get(string key);
 		T Get<T>(string key);
-		IDictionary<string, object> Get(IEnumerable<string> keys);
+		IDictionary<string, T> Get<T>(IEnumerable<string> keys);
 
 		bool TryGet(string key, out object value);
 		bool TryGetWithCas(string key, out CasResult<object> value);

Enyim.Caching/Memcached/Transcoders/DefaultTranscoder.cs

@@ -32,6 +32,26 @@ T ITranscoder.Deserialize<T>(CacheItem item)
         {
             if (item.Data == null || item.Data.Count == 0) return default(T);
 
+            if (typeof(T).GetTypeCode() != TypeCode.Object || typeof(T) == typeof(Byte[]))
+            {
+                var value = Deserialize(item);
+                if (value != null)
+                {
+                    if (typeof(T) == typeof(Guid))
+                    {
+                       return (T)(object)new Guid((string)value);
+                    }
+                    else
+                    {
+                        return (T)value;
+                    }
+                }
+                else
+                {
+                    return default(T);
+                }
+            }
+
             using (var ms = new MemoryStream(item.Data.ToArray()))
             {
                 using (var reader = new BsonDataReader(ms))

Enyim.Caching/MemcachedClient.cs

@@ -182,29 +182,9 @@ public async Task<IGetOperationResult<T>> GetAsync<T>(string key)
 
                     if (commandResult.Success)
                     {
-                        if (typeof(T).GetTypeCode() == TypeCode.Object && typeof(T) != typeof(Byte[]))
-                        {
-                            result.Success = true;
-                            result.Value = this.transcoder.Deserialize<T>(command.Result);
-                            return result;
-                        }
-                        else
-                        {
-                            var tempResult = this.transcoder.Deserialize(command.Result);
-                            if (tempResult != null)
-                            {
-                                result.Success = true;
-                                if (typeof(T) == typeof(Guid))
-                                {
-                                    result.Value = (T)(object)new Guid((string)tempResult);
-                                }
-                                else
-                                {
-                                    result.Value = (T)tempResult;
-                                }
-                                return result;
-                            }
-                        }
+                        result.Success = true;
+                        result.Value = transcoder.Deserialize<T>(command.Result);
+                        return result;
                     }
                 }
                 catch (Exception ex)
@@ -935,9 +915,9 @@ public async Task<bool> RemoveAsync(string key)
         /// </summary>
         /// <param name="keys">The list of identifiers for the items to retrieve.</param>
         /// <returns>a Dictionary holding all items indexed by their key.</returns>
-        public IDictionary<string, object> Get(IEnumerable<string> keys)
+        public IDictionary<string, T> Get<T>(IEnumerable<string> keys)
         {
-            return PerformMultiGet<object>(keys, (mget, kvp) => this.transcoder.Deserialize(kvp.Value));
+            return PerformMultiGet<T>(keys, (mget, kvp) => this.transcoder.Deserialize<T>(kvp.Value));
         }
 
         public IDictionary<string, CasResult<object>> GetWithCas(IEnumerable<string> keys)
@@ -985,6 +965,8 @@ protected virtual IDictionary<string, T> PerformMultiGet<T>(IEnumerable<string>
                                 string original;
                                 if (hashed.TryGetValue(kvp.Key, out original))
                                 {
+                                    Console.WriteLine(kvp.Key);
+                                    Console.WriteLine(kvp.Value);
                                     var result = collector(mget, kvp);
 
                                     // the lock will serialize the merge,

Enyim.Caching/NullMemcachedClient.cs

@@ -80,17 +80,17 @@ public void Dispose()
 
         public void FlushAll()
         {
-            throw new NotImplementedException();
+            
         }
 
-        public IDictionary<string, object> Get(IEnumerable<string> keys)
+        public IDictionary<string, T> Get<T>(IEnumerable<string> keys)
         {
-            throw new NotImplementedException();
+            return new Dictionary<string, T>();
         }
 
         public object Get(string key)
         {
-            throw new NotImplementedException();
+            return null;
         }
 
         public T Get<T>(string key)

MemcachedTest/MemcachedClientTest.cs

@@ -10,6 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
+using System.Linq;
 
 namespace MemcachedTest
 {
@@ -252,27 +253,39 @@ public async Task MultiGetTest()
             {
                 var keys = new List<string>();
 
-                for (int i = 0; i < 100; i++)
+                for (int i = 0; i < 10; i++)
                 {
                     string k = $"Hello_Multi_Get_{Guid.NewGuid()}_" + i;
                     keys.Add(k);
 
-                    Assert.True(await client.StoreAsync(StoreMode.Set, k, i, DateTime.Now.AddSeconds(300)), "Store of " + k + " failed");
+                    Assert.True(await client.StoreAsync(StoreMode.Set, k, i, DateTime.Now.AddSeconds(30)), "Store of " + k + " failed");
                 }
 
-                IDictionary<string, object> retvals = client.Get(keys);
+                IDictionary<string, int> retvals = client.Get<int>(keys);
 
                 Assert.NotEmpty(retvals);
                 Assert.Equal(keys.Count, retvals.Count);
 
-                object value = 0;
+                int value = 0;
                 for (int i = 0; i < keys.Count; i++)
                 {
                     string key = keys[i];
 
                     Assert.True(retvals.TryGetValue(key, out value), "missing key: " + key);
                     Assert.Equal(value, i);
                 }
+
+                var key1 = $"test_key1_{Guid.NewGuid()}";
+                var key2 = $"test_key2_{Guid.NewGuid()}";
+                var obj1 = new HashSet<int> { 1, 2 };
+                var obj2 = new HashSet<int> { 3, 4 };
+                await client.StoreAsync(StoreMode.Set, key1, obj1, DateTime.Now.AddSeconds(10));
+                await client.StoreAsync(StoreMode.Set, key2, obj2, DateTime.Now.AddSeconds(10));
+
+                var multiResult = client.Get<HashSet<int>>(new string[] { key1, key2 });
+                Assert.Equal(2, multiResult.Count);
+                Assert.Equal(obj1.First(), multiResult[key1].First());
+                Assert.Equal(obj2.First(), multiResult[key2].First());
             }
         }