v3.6.2 #288 #287

2881099 · Apr 14, 2020 · 1796942 · 1796942
1 parent e46e87b
commit 1796942
Show file tree

Hide file tree

Showing 68 changed files with 839 additions and 31 deletions.
diff --git a/csredis.sln b/csredis.sln
@@ -10,7 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Help", "Help", "{A5960636-4
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSRedisCore", "src\CSRedisCore.csproj", "{E72D0C8D-66B4-4466-B700-730EAED30285}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSRedisCore", "src\CSRedisCore\CSRedisCore.csproj", "{75C241B2-F18A-4F2E-8C17-80799DFFAAC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.CSRedis", "src\Microsoft.Extensions.Caching.CSRedis\Microsoft.Extensions.Caching.CSRedis.csproj", "{D80EFF1F-91CF-4D22-B36E-3E345A41C05E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,10 +24,14 @@ Global
 		{70B1F8DC-C245-421E-866D-3F4149692F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70B1F8DC-C245-421E-866D-3F4149692F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70B1F8DC-C245-421E-866D-3F4149692F69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E72D0C8D-66B4-4466-B700-730EAED30285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E72D0C8D-66B4-4466-B700-730EAED30285}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E72D0C8D-66B4-4466-B700-730EAED30285}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E72D0C8D-66B4-4466-B700-730EAED30285}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75C241B2-F18A-4F2E-8C17-80799DFFAAC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75C241B2-F18A-4F2E-8C17-80799DFFAAC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75C241B2-F18A-4F2E-8C17-80799DFFAAC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75C241B2-F18A-4F2E-8C17-80799DFFAAC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D80EFF1F-91CF-4D22-B36E-3E345A41C05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D80EFF1F-91CF-4D22-B36E-3E345A41C05E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D80EFF1F-91CF-4D22-B36E-3E345A41C05E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D80EFF1F-91CF-4D22-B36E-3E345A41C05E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/CSRedisClient.cs → src/CSRedisCore/CSRedisClient.cs b/src/CSRedisClient.cs → src/CSRedisCore/CSRedisClient.cs
diff --git a/src/CSRedisClientAsync.cs → src/CSRedisCore/CSRedisClientAsync.cs b/src/CSRedisClientAsync.cs → src/CSRedisCore/CSRedisClientAsync.cs
diff --git a/src/CSRedisClientPipe.cs → src/CSRedisCore/CSRedisClientPipe.cs b/src/CSRedisClientPipe.cs → src/CSRedisCore/CSRedisClientPipe.cs
diff --git a/src/CSRedisCore.csproj → src/CSRedisCore/CSRedisCore.csproj b/src/CSRedisCore.csproj → src/CSRedisCore/CSRedisCore.csproj
@@ -4,7 +4,7 @@
 		<AssemblyName>CSRedisCore</AssemblyName>
 		<PackageId>CSRedisCore</PackageId>
 		<RootNamespace>CSRedisCore</RootNamespace>
-		<Version>3.6.1</Version>
+		<Version>3.6.2</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageProjectUrl>https://github.com/2881099/csredis</PackageProjectUrl>
 		<Description>CSRedis 是 redis.io 官方推荐库，支持 redis-trib集群、哨兵、私有分区与连接池管理技术，简易 RedisHelper 静态类。</Description>

diff --git a/src/Events.cs → src/CSRedisCore/Events.cs b/src/Events.cs → src/CSRedisCore/Events.cs
diff --git a/src/Exceptions.cs → src/CSRedisCore/Exceptions.cs b/src/Exceptions.cs → src/CSRedisCore/Exceptions.cs
diff --git a/src/IRedisClient.cs → src/CSRedisCore/IRedisClient.cs b/src/IRedisClient.cs → src/CSRedisCore/IRedisClient.cs
diff --git a/src/IRedisClientAsync.cs → src/CSRedisCore/IRedisClientAsync.cs b/src/IRedisClientAsync.cs → src/CSRedisCore/IRedisClientAsync.cs
diff --git a/src/IRedisClientSync.cs → src/CSRedisCore/IRedisClientSync.cs b/src/IRedisClientSync.cs → src/CSRedisCore/IRedisClientSync.cs
diff --git a/src/Internal/Commands/RedisArray.cs → ...RedisCore/Internal/Commands/RedisArray.cs b/src/Internal/Commands/RedisArray.cs → ...RedisCore/Internal/Commands/RedisArray.cs
diff --git a/src/Internal/Commands/RedisBool.cs → ...SRedisCore/Internal/Commands/RedisBool.cs b/src/Internal/Commands/RedisBool.cs → ...SRedisCore/Internal/Commands/RedisBool.cs
diff --git a/src/Internal/Commands/RedisBytes.cs → ...RedisCore/Internal/Commands/RedisBytes.cs b/src/Internal/Commands/RedisBytes.cs → ...RedisCore/Internal/Commands/RedisBytes.cs
diff --git a/src/Internal/Commands/RedisDate.cs → ...SRedisCore/Internal/Commands/RedisDate.cs b/src/Internal/Commands/RedisDate.cs → ...SRedisCore/Internal/Commands/RedisDate.cs
diff --git a/src/Internal/Commands/RedisFloat.cs → ...RedisCore/Internal/Commands/RedisFloat.cs b/src/Internal/Commands/RedisFloat.cs → ...RedisCore/Internal/Commands/RedisFloat.cs
diff --git a/src/Internal/Commands/RedisHash.cs → ...SRedisCore/Internal/Commands/RedisHash.cs b/src/Internal/Commands/RedisHash.cs → ...SRedisCore/Internal/Commands/RedisHash.cs
diff --git a/src/Internal/Commands/RedisInt.cs → ...CSRedisCore/Internal/Commands/RedisInt.cs b/src/Internal/Commands/RedisInt.cs → ...CSRedisCore/Internal/Commands/RedisInt.cs
diff --git a/...ommands/RedisIsMasterDownByAddrCommand.cs → ...ommands/RedisIsMasterDownByAddrCommand.cs b/...ommands/RedisIsMasterDownByAddrCommand.cs → ...ommands/RedisIsMasterDownByAddrCommand.cs
diff --git a/src/Internal/Commands/RedisObject.cs → ...edisCore/Internal/Commands/RedisObject.cs b/src/Internal/Commands/RedisObject.cs → ...edisCore/Internal/Commands/RedisObject.cs
diff --git a/src/Internal/Commands/RedisRoleCommand.cs → ...ore/Internal/Commands/RedisRoleCommand.cs b/src/Internal/Commands/RedisRoleCommand.cs → ...ore/Internal/Commands/RedisRoleCommand.cs
diff --git a/src/Internal/Commands/RedisScanCommand.cs → ...ore/Internal/Commands/RedisScanCommand.cs b/src/Internal/Commands/RedisScanCommand.cs → ...ore/Internal/Commands/RedisScanCommand.cs
diff --git a/src/Internal/Commands/RedisSlowLogCommand.cs → .../Internal/Commands/RedisSlowLogCommand.cs b/src/Internal/Commands/RedisSlowLogCommand.cs → .../Internal/Commands/RedisSlowLogCommand.cs
diff --git a/src/Internal/Commands/RedisStatus.cs → ...edisCore/Internal/Commands/RedisStatus.cs b/src/Internal/Commands/RedisStatus.cs → ...edisCore/Internal/Commands/RedisStatus.cs
diff --git a/src/Internal/Commands/RedisStreamCommand.cs → ...e/Internal/Commands/RedisStreamCommand.cs b/src/Internal/Commands/RedisStreamCommand.cs → ...e/Internal/Commands/RedisStreamCommand.cs
diff --git a/src/Internal/Commands/RedisString.cs → ...edisCore/Internal/Commands/RedisString.cs b/src/Internal/Commands/RedisString.cs → ...edisCore/Internal/Commands/RedisString.cs
diff --git a/src/Internal/Commands/RedisSubscription.cs → ...re/Internal/Commands/RedisSubscription.cs b/src/Internal/Commands/RedisSubscription.cs → ...re/Internal/Commands/RedisSubscription.cs
diff --git a/src/Internal/Commands/RedisTuple.cs → ...RedisCore/Internal/Commands/RedisTuple.cs b/src/Internal/Commands/RedisTuple.cs → ...RedisCore/Internal/Commands/RedisTuple.cs
diff --git a/src/Internal/IO/IRedisSocket.cs → src/CSRedisCore/Internal/IO/IRedisSocket.cs b/src/Internal/IO/IRedisSocket.cs → src/CSRedisCore/Internal/IO/IRedisSocket.cs
diff --git a/src/Internal/IO/RedisAsyncCommandToken.cs → ...ore/Internal/IO/RedisAsyncCommandToken.cs b/src/Internal/IO/RedisAsyncCommandToken.cs → ...ore/Internal/IO/RedisAsyncCommandToken.cs
diff --git a/src/Internal/IO/RedisIO.cs → src/CSRedisCore/Internal/IO/RedisIO.cs b/src/Internal/IO/RedisIO.cs → src/CSRedisCore/Internal/IO/RedisIO.cs
@@ -33,7 +33,10 @@ public RedisIO()
         public void SetStream(Stream stream)
         {
             if (_stream != null)
-                _stream.Dispose();
+            {
+                try { _stream.Close(); } catch { }
+                try { _stream.Dispose(); } catch { }
+            }
 
             _stream = stream;
             _reader = new RedisReader(this);
@@ -43,39 +46,47 @@ public void SetStream(Stream stream)
 
 #if net40
 #else
-        public Task<int> WriteAsync(RedisCommand command)
+        async public Task<int> WriteAsync(RedisCommand command)
         {
             var data = _writer.Prepare(command);
-
-            var tcs = new TaskCompletionSource<int>();
-            lock (_streamLock)
-            {
-                Stream.BeginWrite(data, 0, data.Length, asyncResult =>
-                {
-                    try
-                    {
-                        _stream.EndWrite(asyncResult);
-                        tcs.TrySetResult(data.Length);
-                    }
-                    catch (Exception ex)
-                    {
-                        tcs.TrySetException(ex);
-                    }
-                }, null);
-            }
-            return tcs.Task;
+            await Stream.WriteAsync(data, 0, data.Length);
+            return data.Length;
+            //var tcs = new TaskCompletionSource<int>();
+            //lock (_streamLock)
+            //{
+            //    Stream.BeginWrite(data, 0, data.Length, asyncResult =>
+            //    {
+            //        try
+            //        {
+            //            _stream.EndWrite(asyncResult);
+            //            tcs.TrySetResult(data.Length);
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            tcs.TrySetException(ex);
+            //        }
+            //    }, null);
+            //    Stream.Flush();
+            //}
+            //return tcs.Task;
         }
 #endif
 
         public void Write(byte[] data)
         {
             lock (_streamLock)
+            {
                 Stream.Write(data, 0, data.Length);
+                Stream.Flush();
+            }
         }
         public void Write(Stream stream)
         {
             lock (_streamLock)
+            {
                 stream.CopyTo(Stream);
+                Stream.Flush();
+            }
         }
         public int ReadByte()
         {
@@ -138,12 +149,11 @@ public Byte[] ReadAll()
 
         public void Dispose()
         {
-            if (_pipeline != null)
-                _pipeline.Dispose();
+            if (_pipeline != null) _pipeline.Dispose();
             if (_stream != null)
             {
                 try { _stream.Close(); } catch { }
-                _stream.Dispose();
+                try { _stream.Dispose(); } catch { }
             }
         }
 

diff --git a/src/Internal/IO/RedisReader.cs → src/CSRedisCore/Internal/IO/RedisReader.cs b/src/Internal/IO/RedisReader.cs → src/CSRedisCore/Internal/IO/RedisReader.cs
diff --git a/src/Internal/IO/RedisSocket.cs → src/CSRedisCore/Internal/IO/RedisSocket.cs b/src/Internal/IO/RedisSocket.cs → src/CSRedisCore/Internal/IO/RedisSocket.cs
@@ -80,7 +80,7 @@ public Task<bool> ConnectAsync(EndPoint endpoint)
 
         public Stream GetStream()
         {
-            Stream netStream = new NetworkStream(_socket);
+            Stream netStream = new NetworkStream(_socket, true);
 
             if (!_ssl) return netStream;
 

diff --git a/src/Internal/IO/RedisWriter.cs → src/CSRedisCore/Internal/IO/RedisWriter.cs b/src/Internal/IO/RedisWriter.cs → src/CSRedisCore/Internal/IO/RedisWriter.cs
diff --git a/src/Internal/MonitorListener.cs → src/CSRedisCore/Internal/MonitorListener.cs b/src/Internal/MonitorListener.cs → src/CSRedisCore/Internal/MonitorListener.cs
diff --git a/src/Internal/ObjectPool/DefaultPolicy.cs → ...Core/Internal/ObjectPool/DefaultPolicy.cs b/src/Internal/ObjectPool/DefaultPolicy.cs → ...Core/Internal/ObjectPool/DefaultPolicy.cs
diff --git a/src/Internal/ObjectPool/IObjectPool.cs → ...isCore/Internal/ObjectPool/IObjectPool.cs b/src/Internal/ObjectPool/IObjectPool.cs → ...isCore/Internal/ObjectPool/IObjectPool.cs
diff --git a/src/Internal/ObjectPool/IPolicy.cs → ...SRedisCore/Internal/ObjectPool/IPolicy.cs b/src/Internal/ObjectPool/IPolicy.cs → ...SRedisCore/Internal/ObjectPool/IPolicy.cs
diff --git a/src/Internal/ObjectPool/Object.cs → ...CSRedisCore/Internal/ObjectPool/Object.cs b/src/Internal/ObjectPool/Object.cs → ...CSRedisCore/Internal/ObjectPool/Object.cs
diff --git a/src/Internal/ObjectPool/ObjectPool.cs → ...disCore/Internal/ObjectPool/ObjectPool.cs b/src/Internal/ObjectPool/ObjectPool.cs → ...disCore/Internal/ObjectPool/ObjectPool.cs
diff --git a/src/Internal/RedisCommand.cs → src/CSRedisCore/Internal/RedisCommand.cs b/src/Internal/RedisCommand.cs → src/CSRedisCore/Internal/RedisCommand.cs
diff --git a/src/Internal/RedisConnector.cs → src/CSRedisCore/Internal/RedisConnector.cs b/src/Internal/RedisConnector.cs → src/CSRedisCore/Internal/RedisConnector.cs
diff --git a/src/Internal/RedisListener.cs → src/CSRedisCore/Internal/RedisListener.cs b/src/Internal/RedisListener.cs → src/CSRedisCore/Internal/RedisListener.cs
diff --git a/src/Internal/RedisPipeline.cs → src/CSRedisCore/Internal/RedisPipeline.cs b/src/Internal/RedisPipeline.cs → src/CSRedisCore/Internal/RedisPipeline.cs
diff --git a/src/Internal/RedisTransaction.cs → src/CSRedisCore/Internal/RedisTransaction.cs b/src/Internal/RedisTransaction.cs → src/CSRedisCore/Internal/RedisTransaction.cs
diff --git a/src/Internal/SubscriptionListener.cs → ...edisCore/Internal/SubscriptionListener.cs b/src/Internal/SubscriptionListener.cs → ...edisCore/Internal/SubscriptionListener.cs
diff --git a/src/Internal/Utilities/RedisArgs.cs → ...RedisCore/Internal/Utilities/RedisArgs.cs b/src/Internal/Utilities/RedisArgs.cs → ...RedisCore/Internal/Utilities/RedisArgs.cs
diff --git a/src/Internal/Utilities/Serializer.cs → ...edisCore/Internal/Utilities/Serializer.cs b/src/Internal/Utilities/Serializer.cs → ...edisCore/Internal/Utilities/Serializer.cs
diff --git a/src/Net40.cs → src/CSRedisCore/Net40.cs b/src/Net40.cs → src/CSRedisCore/Net40.cs
diff --git a/src/RedisClient.Async.cs → src/CSRedisCore/RedisClient.Async.cs b/src/RedisClient.Async.cs → src/CSRedisCore/RedisClient.Async.cs
diff --git a/src/RedisClient.Sync.cs → src/CSRedisCore/RedisClient.Sync.cs b/src/RedisClient.Sync.cs → src/CSRedisCore/RedisClient.Sync.cs
diff --git a/src/RedisClient.cs → src/CSRedisCore/RedisClient.cs b/src/RedisClient.cs → src/CSRedisCore/RedisClient.cs
diff --git a/src/RedisClientPool.cs → src/CSRedisCore/RedisClientPool.cs b/src/RedisClientPool.cs → src/CSRedisCore/RedisClientPool.cs
diff --git a/src/RedisHelper.cs → src/CSRedisCore/RedisHelper.cs b/src/RedisHelper.cs → src/CSRedisCore/RedisHelper.cs
diff --git a/src/RedisHelperAsync.cs → src/CSRedisCore/RedisHelperAsync.cs b/src/RedisHelperAsync.cs → src/CSRedisCore/RedisHelperAsync.cs
diff --git a/src/RedisSentinelClient.Async.cs → src/CSRedisCore/RedisSentinelClient.Async.cs b/src/RedisSentinelClient.Async.cs → src/CSRedisCore/RedisSentinelClient.Async.cs
diff --git a/src/RedisSentinelClient.Sync.cs → src/CSRedisCore/RedisSentinelClient.Sync.cs b/src/RedisSentinelClient.Sync.cs → src/CSRedisCore/RedisSentinelClient.Sync.cs
diff --git a/src/RedisSentinelClient.cs → src/CSRedisCore/RedisSentinelClient.cs b/src/RedisSentinelClient.cs → src/CSRedisCore/RedisSentinelClient.cs
diff --git a/src/RedisSentinelManager.cs → src/CSRedisCore/RedisSentinelManager.cs b/src/RedisSentinelManager.cs → src/CSRedisCore/RedisSentinelManager.cs
diff --git a/src/Types.cs → src/CSRedisCore/Types.cs b/src/Types.cs → src/CSRedisCore/Types.cs
diff --git a/src/key.snk → src/CSRedisCore/key.snk b/src/key.snk → src/CSRedisCore/key.snk
diff --git a/src/Microsoft.Extensions.Caching.CSRedis/.gitattributes b/src/Microsoft.Extensions.Caching.CSRedis/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain