1. optimize Cache

2. optimize Redis.Paramter.DatabaseId 3. add Redis.expiryInterval
dotnetcore · Dec 5, 2018 · f42c66a · f42c66a
1 parent 9bd86bb
commit f42c66a
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 51 deletions.
diff --git a/doc/Schemas/SmartSqlMap.xsd b/doc/Schemas/SmartSqlMap.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://SmartSql.net/schemas/SmartSqlMap.xsd" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns="http://SmartSql.net/schemas/SmartSqlMap.xsd" 
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://SmartSql.net/schemas/SmartSqlMap.xsd"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns="http://SmartSql.net/schemas/SmartSqlMap.xsd"
   xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" vs:friendlyname="SmartSqlMap Configuration Schema" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
 
   <xs:simpleType name="CSharpType">
@@ -38,7 +38,7 @@
       <xs:enumeration value="Read"/>
     </xs:restriction>
   </xs:simpleType>
-    <xs:simpleType name="Transaction">
+  <xs:simpleType name="Transaction">
     <xs:restriction base="xs:NMTOKEN">
       <xs:enumeration value="Unspecified"/>
       <xs:enumeration value="Chaos"/>
@@ -74,9 +74,10 @@
       <xs:attribute name="Id" type="xs:string" use="required" />
       <xs:attribute name="Type" use="required">
         <xs:simpleType>
-          <xs:restriction base="xs:NMTOKEN">
+          <xs:restriction base="xs:string">
             <xs:enumeration value="Lru"/>
             <xs:enumeration value="Fifo"/>
+            <xs:enumeration value="SmartSql.Cache.Redis.RedisCacheProvider,SmartSql.Cache.Redis"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>

diff --git a/src/SmartSql.Cache.Redis/RedisCacheProvider.cs b/src/SmartSql.Cache.Redis/RedisCacheProvider.cs
@@ -6,80 +6,88 @@
 using StackExchange.Redis;
 using Newtonsoft.Json;
 using SmartSql.Exceptions;
+using System.Linq;
+using SmartSql.Configuration;
 
 namespace SmartSql.Cache.Redis
 {
     public class RedisCacheProvider : ICacheProvider
     {
         private String _connStr;
-        private ConnectionMultiplexer _redis;
+        private ConnectionMultiplexer _redis => RedisManager.Instance.GetRedis(_connStr);
         private int _databaseId = 0;
         private IDatabase CacheDB { get { return _redis.GetDatabase(_databaseId); } }
         private String _prefix;
-
+        private TimeSpan? _expiryInterval;
         public void Initialize(IDictionary properties)
         {
             _connStr = properties["ConnectionString"]?.ToString();
             if (String.IsNullOrEmpty(_connStr))
             {
                 throw new SmartSqlException("SmartSql.Cache.Redis.ConnectionString string can't empty.");
             }
+            _prefix = properties["Cache.Id"]?.ToString();
 
             String databaseIdStr = properties["DatabaseId"]?.ToString();
-            if (String.IsNullOrEmpty(databaseIdStr))
+            if (!String.IsNullOrEmpty(databaseIdStr))
             {
-                throw new SmartSqlException("SmartSql.Cache.Redis.DatabaseId string can't empty.");
+                Int32.TryParse(databaseIdStr, out _databaseId);
             }
-            else
+            var prefixStr = properties["Prefix"]?.ToString();
+            if (!String.IsNullOrEmpty(prefixStr))
             {
-                if (!Int32.TryParse(databaseIdStr, out _databaseId))
-                {
-                    throw new SmartSqlException("SmartSql.Cache.Redis.DatabaseId string is not int.");
-                }
+                _prefix = prefixStr;
             }
-            _prefix = properties["Prefix"]?.ToString();
-            if (String.IsNullOrEmpty(_prefix))
+            if (properties["FlushInterval"] is FlushInterval flushInterval)
             {
-                throw new SmartSqlException("SmartSql.Cache.Redis.Prefix string can't empty.");
+                _expiryInterval = flushInterval.Interval;
             }
+        }
 
-            _redis = RedisManager.Instance.GetRedis(_connStr);
+        private string GetRedisCacheKey(CacheKey key)
+        {
+            return $"{_prefix}:{key.Key}";
         }
 
         public object this[CacheKey key, Type type]
         {
             get
             {
-                string cacheStr = CacheDB.StringGet(key.Key);
+                string cacheStr = CacheDB.StringGet(GetRedisCacheKey(key));
                 if (String.IsNullOrEmpty(cacheStr)) { return null; }
                 return JsonConvert.DeserializeObject(cacheStr, type);
             }
             set
             {
                 string cacheStr = JsonConvert.SerializeObject(value);
-                CacheDB.StringSet(key.Key, cacheStr);
+                CacheDB.StringSet(GetRedisCacheKey(key), cacheStr, _expiryInterval);
             }
         }
 
         public void Flush()
         {
             var serverEndPoint = _redis.GetEndPoints()[0];
             IServer servier = _redis.GetServer(serverEndPoint);
-            var keys = servier.Keys(_databaseId, pattern: $"{_prefix}*");
-            foreach (string key in keys)
+            var keys = servier.Keys(_databaseId, pattern: $"{_prefix}*").ToArray();
+            if (keys.Length > 0)
             {
-                CacheDB.KeyDelete(key);
+                CacheDB.KeyDelete(keys.ToArray());
             }
         }
 
         public bool Remove(CacheKey key)
         {
-            return CacheDB.KeyDelete(key.Key);
+            return CacheDB.KeyDelete(GetRedisCacheKey(key));
         }
 
         public bool Contains(CacheKey key)
         {
-            return CacheDB.KeyExists(key.Key);
+            return CacheDB.KeyExists(GetRedisCacheKey(key));
+        }
+
+        public void Dispose()
+        {
+            _redis.Dispose();
         }
     }
 }
diff --git a/src/SmartSql.Cache.Redis/RedisManager.cs b/src/SmartSql.Cache.Redis/RedisManager.cs
@@ -14,18 +14,35 @@ private RedisManager() { }
 
         public ConnectionMultiplexer GetRedis(String connStr)
         {
+            ConnectionMultiplexer redis;
             if (_redises.ContainsKey(connStr))
             {
-                return _redises[connStr];
+                redis = _redises[connStr];
+                if (redis.IsConnected)
+                {
+                    return redis;
+                }
             }
             lock (this)
             {
                 if (_redises.ContainsKey(connStr))
                 {
-                    return _redises[connStr];
+                    redis = _redises[connStr];
+                    if (redis.IsConnected)
+                    {
+                        return redis;
+                    }
+                }
+                redis = ConnectionMultiplexer.Connect(connStr);
+                if (_redises.ContainsKey(connStr))
+                {
+                    _redises[connStr] = redis;
+                }
+                else
+                {
+                    _redises.Add(connStr, redis);
                 }
-                var redis = ConnectionMultiplexer.Connect(connStr);
-                _redises.Add(connStr, redis);
+
                 return redis;
             }
         }

diff --git a/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj b/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Redis Cache For SmartSql</Description>
     <Authors>Ahoo Wang</Authors>
     <Company>Ahoo Wang</Company>
@@ -10,11 +10,12 @@
     <RepositoryUrl>https://github.com/Ahoo-Wang/SmartSql</RepositoryUrl>
     <PackageTags>SmartSql Dapper MyBatis  ORM Redis Cache</PackageTags>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Version>3.1.0</Version>
+    <Version>3.2.0</Version>
     <PackageIconUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/SmartSql.png</PackageIconUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/LICENSE</PackageLicenseUrl>
     <PackageReleaseNotes>
-      1. fix the cache penetration problem with the cache value of null
+      1. optimize Paramter.DatabaseId
+      2. add expiryInterval
     </PackageReleaseNotes>
   </PropertyGroup>
 
@@ -28,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
-    <PackageReference Include="StackExchange.Redis" Version="1.2.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.0.519" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartSql.UTests/DyRepository/DyRepository_Tests.cs b/src/SmartSql.UTests/DyRepository/DyRepository_Tests.cs
@@ -7,18 +7,25 @@
 using System.Threading.Tasks;
 using Xunit;
 using Microsoft.Extensions.Logging;
+using SmartSql.Abstractions;
+
 namespace SmartSql.UTests.DyRepository
 {
     public class DyRepository_Tests : TestBase
     {
         IEntityRepository _repository;
+        ISmartSqlMapper _sqlMapper;
         public DyRepository_Tests()
         {
             string scope_template = "I{Scope}Repository";
             var builder = new RepositoryBuilder(scope_template, null, LoggerFactory.CreateLogger<RepositoryBuilder>());
             var factory = new RepositoryFactory(builder, LoggerFactory.CreateLogger<RepositoryFactory>());
-            var sqlMapper = MapperContainer.Instance.GetSqlMapper();
-            _repository = factory.CreateInstance<IEntityRepository>(sqlMapper);
+            _sqlMapper = MapperContainer.Instance.GetSqlMapper(new SmartSqlOptions
+            {
+                Alias = "DyRepository_Tests",
+                ConfigPath = Consts.DEFAULT_SMARTSQL_CONFIG_PATH
+            });
+            _repository = factory.CreateInstance<IEntityRepository>(_sqlMapper);
         }
 
         [Fact]
@@ -238,7 +245,7 @@ public async Task QueryAsync()
 
         public void Dispose()
         {
-            MapperContainer.Instance.Dispose();
+            _sqlMapper.Dispose();
         }
 
         public class QueryByPageRequest

diff --git a/src/SmartSql.UTests/Maps/T_Entity.xml b/src/SmartSql.UTests/Maps/T_Entity.xml
@@ -113,7 +113,7 @@
           </Switch>
         </IsNotEmpty>
         <For Prepend="And" Key="Key" Open="T.FLong In (" Close=")" Property="Ids" Separator=",">
-          @Key
+          @Key,@Key
         </For>
         <For Prepend="And" Key="LikeKey" Open="(" Close=")" Property="FStrings" Separator="Or">
           T.FString Like Concat(@LikeKey,'%')
@@ -218,7 +218,7 @@
         (10)
       </IsNull>-->
       T.* From T_Entity T With(NoLock)
-      <Include RefId="QueryPs"/>
+      <Include RefId="QueryParams"/>
       <Switch Prepend="Order By" Property="OrderBy">
         <Default>
           T.FLong Desc

diff --git a/src/SmartSql.UTests/SmartSql.UTests.csproj b/src/SmartSql.UTests/SmartSql.UTests.csproj
@@ -23,6 +23,7 @@
     <ProjectReference Include="..\SmartSql.Batch.SqlServer\SmartSql.Batch.SqlServer.csproj" />
     <ProjectReference Include="..\SmartSql.Batch.PostgreSql\SmartSql.Batch.PostgreSql.csproj" />
     <ProjectReference Include="..\SmartSql.Batch\SmartSql.Batch.csproj" />
+    <ProjectReference Include="..\SmartSql.Cache.Redis\SmartSql.Cache.Redis.csproj" />
     <ProjectReference Include="..\SmartSql.Extensions\SmartSql.Extensions.csproj" />
     <ProjectReference Include="..\SmartSql.DapperDeserializer\SmartSql.DapperDeserializer.csproj" />
     <ProjectReference Include="..\SmartSql.DIExtension\SmartSql.DIExtension.csproj" />

diff --git a/src/SmartSql.UTests/SmartSqlContext_Test.cs b/src/SmartSql.UTests/SmartSqlContext_Test.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using SmartSql.Abstractions.Config;
+using System;
 using Xunit;
 
 namespace SmartSql.UTests

diff --git a/src/SmartSql.UTests/SmartSqlMapConfig.xml b/src/SmartSql.UTests/SmartSqlMapConfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <SmartSqlMapConfig xmlns="http://SmartSql.net/schemas/SmartSqlMapConfig.xsd">
-  <Settings IsWatchConfigFile="false" IgnoreParameterCase="false" ParameterPrefix="$" IsCacheEnabled="false"/>
+  <Settings IsWatchConfigFile="false" IgnoreParameterCase="false" ParameterPrefix="$" IsCacheEnabled="true"/>
   <Database>
     <!--ParameterPrefix:[SqlServer:@ | MySQL:? |Oracle::] -->
     <DbProvider Name="SqlClientFactory" ParameterPrefix="@" Type="System.Data.SqlClient.SqlClientFactory,System.Data.SqlClient"  />

diff --git a/src/SmartSql.UTests/SmartSqlMapper_Test.cs b/src/SmartSql.UTests/SmartSqlMapper_Test.cs
@@ -14,7 +14,11 @@ public class SmartSqlMapper_Test : TestBase, IDisposable
         ISmartSqlMapper _sqlMapper;
         public SmartSqlMapper_Test()
         {
-            _sqlMapper = MapperContainer.Instance.GetSqlMapper();
+            _sqlMapper = MapperContainer.Instance.GetSqlMapper(new SmartSqlOptions
+            {
+                Alias = "SmartSqlMapper_Test",
+                ConfigPath = Consts.DEFAULT_SMARTSQL_CONFIG_PATH
+            });
         }
 
         public void Dispose()

diff --git a/src/SmartSql/Abstractions/Cache/CacheKey.cs b/src/SmartSql/Abstractions/Cache/CacheKey.cs
@@ -5,11 +5,6 @@ namespace SmartSql.Abstractions.Cache
 {
     public class CacheKey
     {
-        /// <summary>
-        /// 缓存前缀
-        /// </summary>
-        public String Prefix { get; set; } = "SmartSql-Cache";
-
         public String Key { get; private set; }
         public CacheKey(RequestContext context)
         {

diff --git a/src/SmartSql/Abstractions/Cache/ICacheProvider.cs b/src/SmartSql/Abstractions/Cache/ICacheProvider.cs
@@ -5,7 +5,7 @@
 
 namespace SmartSql.Abstractions.Cache
 {
-    public interface ICacheProvider
+    public interface ICacheProvider : IDisposable
     {
         void Initialize(IDictionary properties);
         object this[CacheKey key, Type type]

diff --git a/src/SmartSql/Cache/CacheManager.cs b/src/SmartSql/Cache/CacheManager.cs
@@ -108,9 +108,7 @@ private void FlushInterval()
             catch (Exception ex)
             {
                 _logger.LogError(new EventId(ex.HResult), ex, ex.Message);
-
             }
-
         }
 
         private void FlushOnExecute(RequestContext requestContext)
@@ -144,6 +142,10 @@ private void UpdateCacheFlushTime(string cacheId, DateTime flushTime)
         public void Dispose()
         {
             _timer.Dispose();
+            foreach (var cacheKV in _smartSqlContext.MappedCache)
+            {
+                cacheKV.Value.Provider.Dispose();
+            }
         }
 
         public bool TryGet<T>(RequestContext context, out T cachedResult)

diff --git a/src/SmartSql/Cache/FifoCacheProvider.cs b/src/SmartSql/Cache/FifoCacheProvider.cs
@@ -68,6 +68,9 @@ public void Initialize(IDictionary properties)
             }
         }
 
+        public void Dispose()
+        {
 
+        }
     }
 }
diff --git a/src/SmartSql/Cache/LruCacheProvider.cs b/src/SmartSql/Cache/LruCacheProvider.cs
@@ -69,5 +69,9 @@ public void Initialize(IDictionary properties)
             }
         }
 
+        public void Dispose()
+        {
+
+        }
     }
 }
diff --git a/src/SmartSql/Cache/NoneCacheProvider.cs b/src/SmartSql/Cache/NoneCacheProvider.cs
@@ -19,6 +19,11 @@ public bool Contains(CacheKey key)
             return false;
         }
 
+        public void Dispose()
+        {
+
+        }
+
         public void Flush()
         {