1. Fixed cache (FIFO & LRU) not removed after maximum size.

Ahoo-Wang · Ahoo-Wang · commit ae21953df6a1 · 2017-09-13T11:13:43.000+08:00
2. Optimizing lock related functions.
diff --git a/SmartSql.Tests/DataAccess/DataAccess_Test.cs b/SmartSql.Tests/DataAccess/DataAccess_Test.cs
@@ -3,13 +3,19 @@
 using System.Text;
 using SmartSql.DataAccess;
 using Xunit;
+using SmartSql.Abstractions;
 
 namespace SmartSql.Tests.DataAccess
 {
 
-    public class DataAccess_Test : IDisposable
+    public class DataAccess_Test : TestBase
     {
-        private static TestDataAccess dao = new TestDataAccess();
+        private TestDataAccess dao;
+        public DataAccess_Test()
+        {
+            dao = new TestDataAccess(SqlMapper);
+        }
+
         [Fact]
         public void Insert()
         {
@@ -59,16 +65,11 @@ public void GetEntity()
             var entity = dao.GetEntity<long>(240162);
             // Assert.NotNull(entity);
         }
-
-        public void Dispose()
-        {
-            MapperContainer.Instance.Dispose();
-        }
     }
 
     public class TestDataAccess : DataAccessGeneric<T_Test>
     {
-        public TestDataAccess()
+        public TestDataAccess(ISmartSqlMapper smartSqlMapper) : base(smartSqlMapper)
         {
 
         }
diff --git a/SmartSql.Tests/TestBase.cs b/SmartSql.Tests/TestBase.cs
@@ -6,13 +6,18 @@
 
 namespace SmartSql.Tests
 {
-    public abstract class TestBase: IDisposable
+    public abstract class TestBase : IDisposable
     {
-        protected ISmartSqlMapper SqlMapper = MapperContainer.Instance.GetSqlMapper();
+        protected ISmartSqlMapper SqlMapper;
+        public TestBase()
+        {
+            SqlMapper = new SmartSqlMapper();
+        }
+
 
         public void Dispose()
         {
-            MapperContainer.Instance.Dispose();
+            SqlMapper.Dispose();
         }
     }
 
diff --git a/SmartSql/Common/FileWatcherLoader.cs b/SmartSql/Common/FileWatcherLoader.cs
@@ -46,7 +46,7 @@ public void Clear()
         {
             for (int i = 0; i < _fileWatchers.Count; i++)
             {
-                FileSystemWatcher fileWatcher = (FileSystemWatcher)_fileWatchers[i];
+                FileSystemWatcher fileWatcher = _fileWatchers[i];
                 fileWatcher.EnableRaisingEvents = false;
                 fileWatcher.Dispose();
             }
diff --git a/SmartSql/DbSession/DbConnectionSessionStore.cs b/SmartSql/DbSession/DbConnectionSessionStore.cs
@@ -9,14 +9,14 @@
 namespace SmartSql.DbSession
 {
     /// <summary>
-    /// For 
+    /// DbConnection Session Store 
     /// </summary>
     public class DbConnectionSessionStore : IDbConnectionSessionStore
     {
         private readonly ILogger _logger;
         const string KEY = "SmartSql-Local-DbSesstion-";
         protected string sessionName = string.Empty;
-        private AsyncLocal<IDictionary<string, IDbConnectionSession>> staticSessions
+        private static AsyncLocal<IDictionary<string, IDbConnectionSession>> staticSessions
             = new AsyncLocal<IDictionary<string, IDbConnectionSession>>();
         public IDbConnectionSession LocalSession
         {
@@ -47,13 +47,7 @@ public void Store(IDbConnectionSession session)
         {
             if (staticSessions.Value == null)
             {
-                lock (this)
-                {
-                    if (staticSessions.Value == null)
-                    {
-                        staticSessions.Value = new Dictionary<String, IDbConnectionSession>();
-                    }
-                }
+                staticSessions.Value = new Dictionary<String, IDbConnectionSession>();
             }
             staticSessions.Value[sessionName] = session;
         }
diff --git a/SmartSql/LocalFileConfigLoader.cs b/SmartSql/LocalFileConfigLoader.cs
@@ -99,9 +99,12 @@ private void WatchConfig(ISmartSqlMapper smartSqlMapper)
             var cofigFileInfo = FileLoader.GetInfo(config.Path);
             FileWatcherLoader.Instance.Watch(cofigFileInfo, () =>
             {
-                _logger.LogDebug($"LocalFileConfigLoader Changed ReloadConfig: {config.Path} Starting");
-                var newConfig = Load(config.Path, smartSqlMapper);
-                _logger.LogDebug($"LocalFileConfigLoader Changed ReloadConfig: {config.Path} End");
+                lock (this)
+                {
+                    _logger.LogDebug($"LocalFileConfigLoader Changed ReloadConfig: {config.Path} Starting");
+                    var newConfig = Load(config.Path, smartSqlMapper);
+                    _logger.LogDebug($"LocalFileConfigLoader Changed ReloadConfig: {config.Path} End");
+                }
             });
             #endregion
             #region SmartSqlMaps File Watch
@@ -112,15 +115,18 @@ private void WatchConfig(ISmartSqlMapper smartSqlMapper)
                 var sqlMapFileInfo = FileLoader.GetInfo(sqlmap.Path);
                 FileWatcherLoader.Instance.Watch(sqlMapFileInfo, () =>
                 {
-                    _logger.LogDebug($"LocalFileConfigLoader Changed Reload SmartSqlMap: {sqlmap.Path} Starting");
-                    var sqlmapStream = LoadConfigStream(sqlmap.Path);
-                    var newSqlmap = LoadSmartSqlMap(sqlmapStream, config);
-                    sqlmap.Scope = newSqlmap.Scope;
-                    sqlmap.Statements = newSqlmap.Statements;
-                    sqlmap.Caches = newSqlmap.Caches;
-                    config.ResetMappedStatements();
-                    smartSqlMapper.CacheManager.ResetMappedCaches();
-                    _logger.LogDebug($"LocalFileConfigLoader Changed Reload SmartSqlMap: {sqlmap.Path} End");
+                    lock (this)
+                    {
+                        _logger.LogDebug($"LocalFileConfigLoader Changed Reload SmartSqlMap: {sqlmap.Path} Starting");
+                        var sqlmapStream = LoadConfigStream(sqlmap.Path);
+                        var newSqlmap = LoadSmartSqlMap(sqlmapStream, config);
+                        sqlmap.Scope = newSqlmap.Scope;
+                        sqlmap.Statements = newSqlmap.Statements;
+                        sqlmap.Caches = newSqlmap.Caches;
+                        config.ResetMappedStatements();
+                        smartSqlMapper.CacheManager.ResetMappedCaches();
+                        _logger.LogDebug($"LocalFileConfigLoader Changed Reload SmartSqlMap: {sqlmap.Path} End");
+                    }
                 });
                 #endregion
             }
diff --git a/SmartSql/SmartSql.csproj b/SmartSql/SmartSql.csproj
@@ -10,11 +10,12 @@
     <PackageProjectUrl>https://github.com/Ahoo-Wang/SmartSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Ahoo-Wang/SmartSql</RepositoryUrl>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Version>2.0.7</Version>
-    <AssemblyVersion>2.0.7.0</AssemblyVersion>
-    <FileVersion>2.0.7.0</FileVersion>
+    <Version>2.0.8</Version>
+    <AssemblyVersion>2.0.8.0</AssemblyVersion>
+    <FileVersion>2.0.8.0</FileVersion>
     <PackageTags>SmartSql Dapper MyBatis Cache(Memory | Redis)  ZooKeeper   R/W Splitting</PackageTags>
-    <PackageReleaseNotes>Fixed cache (FIFO &amp; LRU) not removed after maximum size.</PackageReleaseNotes>
+    <PackageReleaseNotes>1. Fixed cache (FIFO &amp; LRU) not removed after maximum size.
+2. Optimizing lock related functions.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,19 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using SmartSql.DataAccess;`
`5`	`5`	`using Xunit;`
	`6`	`+using SmartSql.Abstractions;`
`6`	`7`
`7`	`8`	`namespace SmartSql.Tests.DataAccess`
`8`	`9`	`{`
`9`	`10`
`10`		`- public class DataAccess_Test : IDisposable`
	`11`	`+ public class DataAccess_Test : TestBase`
`11`	`12`	`{`
`12`		`- private static TestDataAccess dao = new TestDataAccess();`
	`13`	`+ private TestDataAccess dao;`
	`14`	`+ public DataAccess_Test()`
	`15`	`+ {`
	`16`	`+ dao = new TestDataAccess(SqlMapper);`
	`17`	`+ }`
	`18`	`+`
`13`	`19`	`[Fact]`
`14`	`20`	`public void Insert()`
`15`	`21`	`{`
`@@ -59,16 +65,11 @@ public void GetEntity()`
`59`	`65`	`var entity = dao.GetEntity<long>(240162);`
`60`	`66`	`// Assert.NotNull(entity);`
`61`	`67`	`}`
`62`		`-`
`63`		`- public void Dispose()`
`64`		`- {`
`65`		`- MapperContainer.Instance.Dispose();`
`66`		`- }`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`public class TestDataAccess : DataAccessGeneric<T_Test>`
`70`	`71`	`{`
`71`		`- public TestDataAccess()`
	`72`	`+ public TestDataAccess(ISmartSqlMapper smartSqlMapper) : base(smartSqlMapper)`
`72`	`73`	`{`
`73`	`74`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,18 @@`
`6`	`6`
`7`	`7`	`namespace SmartSql.Tests`
`8`	`8`	`{`
`9`		`- public abstract class TestBase: IDisposable`
	`9`	`+ public abstract class TestBase : IDisposable`
`10`	`10`	`{`
`11`		`- protected ISmartSqlMapper SqlMapper = MapperContainer.Instance.GetSqlMapper();`
	`11`	`+ protected ISmartSqlMapper SqlMapper;`
	`12`	`+ public TestBase()`
	`13`	`+ {`
	`14`	`+ SqlMapper = new SmartSqlMapper();`
	`15`	`+ }`
	`16`	`+`
`12`	`17`
`13`	`18`	`public void Dispose()`
`14`	`19`	`{`
`15`		`- MapperContainer.Instance.Dispose();`
	`20`	`+ SqlMapper.Dispose();`
`16`	`21`	`}`
`17`	`22`	`}`
`18`	`23`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void Clear()`
`46`	`46`	`{`
`47`	`47`	`for (int i = 0; i < _fileWatchers.Count; i++)`
`48`	`48`	`{`
`49`		`- FileSystemWatcher fileWatcher = (FileSystemWatcher)_fileWatchers[i];`
	`49`	`+ FileSystemWatcher fileWatcher = _fileWatchers[i];`
`50`	`50`	`fileWatcher.EnableRaisingEvents = false;`
`51`	`51`	`fileWatcher.Dispose();`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`	`namespace SmartSql.DbSession`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`		`- /// For`
	`12`	`+ /// DbConnection Session Store`
`13`	`13`	`/// </summary>`
`14`	`14`	`public class DbConnectionSessionStore : IDbConnectionSessionStore`
`15`	`15`	`{`
`16`	`16`	`private readonly ILogger _logger;`
`17`	`17`	`const string KEY = "SmartSql-Local-DbSesstion-";`
`18`	`18`	`protected string sessionName = string.Empty;`
`19`		`- private AsyncLocal<IDictionary<string, IDbConnectionSession>> staticSessions`
	`19`	`+ private static AsyncLocal<IDictionary<string, IDbConnectionSession>> staticSessions`
`20`	`20`	`= new AsyncLocal<IDictionary<string, IDbConnectionSession>>();`
`21`	`21`	`public IDbConnectionSession LocalSession`
`22`	`22`	`{`
`@@ -47,13 +47,7 @@ public void Store(IDbConnectionSession session)`
`47`	`47`	`{`
`48`	`48`	`if (staticSessions.Value == null)`
`49`	`49`	`{`
`50`		`- lock (this)`
`51`		`- {`
`52`		`- if (staticSessions.Value == null)`
`53`		`- {`
`54`		`- staticSessions.Value = new Dictionary<String, IDbConnectionSession>();`
`55`		`- }`
`56`		`- }`
	`50`	`+ staticSessions.Value = new Dictionary<String, IDbConnectionSession>();`
`57`	`51`	`}`
`58`	`52`	`staticSessions.Value[sessionName] = session;`
`59`	`53`	`}`