Merge pull request #92 from cnblogs/refactor-PooledSocket-ReadAsync

Refactor PooledSocket.ReadAsync method

Author: cnblogsTim

Enyim.Caching.Tests/MemcachedClientGetTests.cs

@@ -103,8 +103,8 @@ public async Task GetValueOrCreateAsyncTest()
         {
             var key = "GetValueOrCreateAsyncTest_" + Guid.NewGuid();
             var posts1 = await _client.GetValueOrCreateAsync(
-                key, 
-                10, 
+                key,
+                10,
                 async () => await GenerateValue());
             Assert.NotNull(posts1);
 
@@ -129,6 +129,7 @@ private Task<IEnumerable<BlogPost>> GenerateValue()
     internal class BlogPost
     {
         public string Title { get; set; }
+        public string Tags { get; set; }
         public string Body { get; set; }
     }
 }

Enyim.Caching/Enyim.Caching.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>EnyimMemcachedCore is a Memcached client library for .NET Core. Usage: Add services.AddEnyimMemcached(...) and app.UseEnyimMemcached() in Startup. Add IMemcachedClient into constructor.</Description>
-    <VersionPrefix>2.1.8</VersionPrefix>
+    <VersionPrefix>2.1.11</VersionPrefix>
     <Authors>cnblogs.com</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

Enyim.Caching/Memcached/PooledSocket.cs

@@ -35,11 +35,11 @@ public PooledSocket(DnsEndPoint endpoint, TimeSpan connectionTimeout, TimeSpan r
 
             var timeout = connectionTimeout == TimeSpan.MaxValue
                 ? Timeout.Infinite
-                : (int) connectionTimeout.TotalMilliseconds;
+                : (int)connectionTimeout.TotalMilliseconds;
 
             var rcv = receiveTimeout == TimeSpan.MaxValue
                 ? Timeout.Infinite
-                : (int) receiveTimeout.TotalMilliseconds;
+                : (int)receiveTimeout.TotalMilliseconds;
 
             socket.ReceiveTimeout = rcv;
             socket.SendTimeout = rcv;
@@ -234,41 +234,30 @@ public int ReadByteAsync()
             }
         }
 
-//        public async Task<byte[]> ReadBytesAsync(int count)
-//        {
-//            var buffer = new ArraySegment<byte>(new byte[count], 0, count);
-//            await this.socket.ReceiveAsync(buffer, SocketFlags.None);
-//            return buffer.Array;
-//        }
-//        
-        public async Task<byte[]> ReadBytesAsync(int count)
+        public async Task ReadAsync(byte[] buffer, int offset, int count)
         {
             this.CheckDisposed();
-            try
+
+            int read = 0;
+            int shouldRead = count;
+
+            while (read < count)
             {
-                var buffer = new ArraySegment<byte>(new byte[count], 0, count);
-                int read = 0;
-                int offset = 0;
-                int shouldRead = count;
-                while (read < count)
+                try
                 {
-                    var currentRead = await inputStream.ReadAsync(buffer.Array, offset, shouldRead);
+                    int currentRead = await this.inputStream.ReadAsync(buffer, offset, shouldRead);
                     if (currentRead < 1)
-                    {
                         continue;
-                    }
 
                     read += currentRead;
                     offset += currentRead;
                     shouldRead -= currentRead;
                 }
-
-                return buffer.Array;
-            }
-            catch (IOException)
-            {
-                this.isAlive = false;
-                throw;
+                catch (IOException)
+                {
+                    this.isAlive = false;
+                    throw;
+                }
             }
         }
 

Enyim.Caching/Memcached/Protocol/Binary/BinaryResponse.cs

@@ -64,7 +64,7 @@ public unsafe bool Read(PooledSocket socket)
             if (dataLength > 0)
             {
                 var data = new byte[dataLength];
-                socket.Read(data, 0, dataLength);                
+                socket.Read(data, 0, dataLength);
 
                 this.Extra = new ArraySegment<byte>(data, 0, extraLength);
                 this.Data = new ArraySegment<byte>(data, extraLength, data.Length - extraLength);
@@ -79,15 +79,17 @@ public async Task<bool> ReadAsync(PooledSocket socket)
 
             if (!socket.IsAlive) return false;
 
-            var header = await socket.ReadBytesAsync(HeaderLength);
+            var header = new byte[HeaderLength];
+            await socket.ReadAsync(header, 0, header.Length);
 
             int dataLength, extraLength;
 
             DeserializeHeader(header, out dataLength, out extraLength);
 
             if (dataLength > 0)
             {
-                var data = await socket.ReadBytesAsync(dataLength);
+                var data = new byte[dataLength];
+                await socket.ReadAsync(data, 0, dataLength);
 
                 this.Extra = new ArraySegment<byte>(data, 0, extraLength);
                 this.Data = new ArraySegment<byte>(data, extraLength, data.Length - extraLength);

EnyimCachingCore.sln

@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{46CD2BBA-9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{9954C92E-50E2-477C-AC47-31C857C46370}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleWebApp.IntegrationTests", "SampleWebApp.IntegrationTests\SampleWebApp.IntegrationTests.csproj", "{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApp.IntegrationTests", "SampleWebApp.IntegrationTests\SampleWebApp.IntegrationTests.csproj", "{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution