Merge pull request #27 from dotnetcore/dev

Release new version
dotnetcore · Mar 24, 2018 · ed49429 · ed49429
2 parents 295092d + fd59689
commit ed49429
Show file tree

Hide file tree

Showing 24 changed files with 335 additions and 135 deletions.
diff --git a/src/EasyCaching.Core/EasyCaching.Core.csproj b/src/EasyCaching.Core/EasyCaching.Core.csproj
@@ -4,18 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>   
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.4</Version>
+    <Version>0.2.0</Version>
     <Description>          
       EasyCaching is a open source caching library that contains basic usages and some advanced usages of caching which can help us to handle caching more easier!
     </Description>
     <PackageTags>Caching,Cache,Distributed,Memory,Interceptor,Synchronization,Hybrid</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
-    <PackageReleaseNotes>
-      Add some new caching APIs.
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageReleaseNotes>      
+      Add GetCount and Flush for providers.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Core/IEasyCachingProvider.cs b/src/EasyCaching.Core/IEasyCachingProvider.cs
@@ -189,5 +189,17 @@ public interface IEasyCachingProvider
         /// <returns>The all async.</returns>
         /// <param name="cacheKeys">Cache keys.</param>
         Task RemoveAllAsync(IEnumerable<string> cacheKeys);
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <returns>The count.</returns>
+        /// <param name="prefix">Prefix.</param>
+        int GetCount(string prefix = "");
+
+        /// <summary>
+        /// Flush this instance.
+        /// </summary>
+        void Flush();
     }
 }
diff --git a/src/EasyCaching.Core/Internal/BaseRedisOptions.cs b/src/EasyCaching.Core/Internal/BaseRedisOptions.cs
@@ -47,5 +47,12 @@ public class BaseRedisOptions
         /// The endpoints.
         /// </value>
         public IList<ServerEndPoint> Endpoints { get; } = new List<ServerEndPoint>();
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="T:EasyCaching.Core.Internal.BaseRedisOptions"/>
+        /// allow admin.
+        /// </summary>
+        /// <value><c>true</c> if allow admin; otherwise, <c>false</c>.</value>
+        public bool AllowAdmin { get; set; } = false;
     }
 }
diff --git a/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj b/src/EasyCaching.HybridCache/EasyCaching.HybridCache.csproj
@@ -4,18 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.2</Version>
+    <Version>0.2.0</Version>
     <Description>    
       EasyCaching.HybridCache combines local caching and distributed caching.           
     </Description>
     <PackageTags>Caching,Cache,Synchronization,Hybrid</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes> 
-      Add some new caching APIs.
+      Implement GetCount and Flush.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.HybridCache/HybridCachingProvider.cs b/src/EasyCaching.HybridCache/HybridCachingProvider.cs
@@ -585,5 +585,32 @@ public async Task RemoveAllAsync(IEnumerable<string> cacheKeys)
                 System.Console.WriteLine(ex.Message);
             }
         }
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <returns>The count.</returns>
+        /// <param name="prefix">Prefix.</param>
+        public int GetCount(string prefix = "")
+        {
+            return Math.Max(_localCachingProvider.GetCount(prefix), _distributedCachingProvider.GetCount(prefix));
+        }
+
+        /// <summary>
+        /// Flush this instance.
+        /// </summary>
+        public void Flush()
+        {
+            _localCachingProvider.Flush();
+
+            try
+            {
+                _distributedCachingProvider.Flush();
+            }
+            catch (Exception ex)
+            {
+                System.Console.WriteLine(ex.Message);
+            }
+        }
     }
 }
diff --git a/src/EasyCaching.InMemory/DefaultInMemoryCachingProvider.cs b/src/EasyCaching.InMemory/DefaultInMemoryCachingProvider.cs
@@ -455,5 +455,31 @@ public async Task RemoveAllAsync(IEnumerable<string> cacheKeys)
 
             await Task.WhenAll(tasks);
         }
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <returns>The count.</returns>
+        /// <param name="prefix">Prefix.</param>
+        public int GetCount(string prefix = "")
+        {
+            return string.IsNullOrWhiteSpace(prefix) 
+                    ? _cacheKeys.Count 
+                    : _cacheKeys.Count(x => x.StartsWith(prefix.Trim(), StringComparison.OrdinalIgnoreCase)); 
+        }
+
+        /// <summary>
+        /// Flush this instance.
+        /// </summary>
+        public void Flush()
+        {
+            ////new instance
+            //_cache = new MemoryCache(new MemoryCacheOptions());
+
+            foreach (var item in _cacheKeys)
+                _cache.Remove(item);
+
+            _cacheKeys.Clear();
+        }
     }
 }
diff --git a/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj b/src/EasyCaching.InMemory/EasyCaching.InMemory.csproj
@@ -4,18 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.4</Version>
+    <Version>0.2.0</Version>
     <Description>
       In-memory cache based on EasyCaching.Core and Microsoft.Extensions.Caching.Memory      
     </Description>
     <PackageTags>Caching,Cache,In-Memory</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes>
-      Add some new caching APIs.
+      Implement GetCount and Flush.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj b/src/EasyCaching.Interceptor.AspectCore/EasyCaching.Interceptor.AspectCore.csproj
@@ -4,27 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.2</Version>
+    <Version>0.2.0</Version>
     <Description>      
       Caching Interceptor based on EasyCaching.Core and AspectCore
     </Description>
     <PackageTags>Caching,Cache,Distributed,Memory,Interceptor,Synchronization</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes>
-      v0.1.2
-      1. Enable IsAll when using Evict. 
-
-      v0.1.1
-      1. Get caching with data retriever =&gt; without data retriever .
-      2. Caching Handle with async method.
-      3. Introduct Able , Put And Evict.
-
-      v0.1.0 
-      Init.
+      Add some extension methods.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj b/src/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj
@@ -4,26 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.2</Version>
+    <Version>0.2.0</Version>
     <Description>
       Caching Interceptor based on EasyCaching.Core and Castle
     </Description>
     <PackageTags>Caching,Cache,Distributed,Memory,Interceptor,Synchronization</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes>
-      v0.1.2
-      1. Enable IsAll when using Evict. 
-
-      v0.1.1
-      1. Get caching with data retriever =&gt; without data retriever .
-      2. Introduct Able , Put And Evict.
-
-      v 0.1.0 
-      Init.
+      Add some extension methods. 
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Memcached/DefaultMemcachedCachingProvider.cs b/src/EasyCaching.Memcached/DefaultMemcachedCachingProvider.cs
@@ -460,5 +460,32 @@ public async Task RemoveAllAsync(IEnumerable<string> cacheKeys)
 
             await Task.WhenAll(tasks);
         }
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <returns>The count.</returns>
+        /// <param name="prefix">Prefix.</param>
+        public int GetCount(string prefix = "")
+        {
+            if(string.IsNullOrWhiteSpace(prefix))
+            {
+                //Inaccurate, sometimes, memcached just causes items to expire but not free up or flush memory at once.
+                return int.Parse(_memcachedClient.Stats().GetRaw("curr_items").FirstOrDefault().Value);
+            }
+            else
+            {
+                return 0;
+            }  
+        }
+
+        /// <summary>
+        /// Flush this instance.
+        /// </summary>
+        public void Flush()
+        {
+            //not flush memory at once, just causes all items to expire
+            _memcachedClient.FlushAll();
+        }
     }
 }
diff --git a/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj b/src/EasyCaching.Memcached/EasyCaching.Memcached.csproj
@@ -4,18 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.5</Version>
+    <Version>0.2.0</Version>
     <Description>
       EasyCaching.Memcached based on EasyCaching.Core and EnyimMemcachedCore
     </Description>
     <PackageTags>Caching,Cache,Distributed,Memcached</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes>      
-      Simplify the usage of Memcached Transcoder
+      Implement GetCount and Flush.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Redis/DefaultRedisCachingProvider.cs b/src/EasyCaching.Redis/DefaultRedisCachingProvider.cs
@@ -553,5 +553,36 @@ public async Task RemoveAllAsync(IEnumerable<string> cacheKeys)
             if (redisKeys.Length > 0)
                 await _cache.KeyDeleteAsync(redisKeys);
         }
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <returns>The count.</returns>
+        /// <param name="prefix">Prefix.</param>
+        public int GetCount(string prefix = "")
+        {
+            if(string.IsNullOrWhiteSpace(prefix))
+            {
+                var allCount = 0;
+
+                foreach (var server in _servers)
+                    allCount += (int)server.DatabaseSize(_cache.Database);
+
+                return allCount;
+            }            
+
+            return this.SearchRedisKeys(this.HandlePrefix(prefix)).Length;  
+        }
+
+        /// <summary>
+        /// Flush this instance.
+        /// </summary>
+        public void Flush()
+        {
+            foreach (var server in _servers)
+            {
+                server.FlushDatabase(_cache.Database);
+            }
+        }
     }
 }
diff --git a/src/EasyCaching.Redis/EasyCaching.Redis.csproj b/src/EasyCaching.Redis/EasyCaching.Redis.csproj
@@ -4,18 +4,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Owners>Catcher Wong</Owners>
     <Authors>Catcher Wong</Authors>    
-    <Version>0.1.4</Version>
+    <Version>0.2.0</Version>
     <Description>      
       EasyCaching.Redis based on EasyCaching.Core and StackExchange.Redis
     </Description>
     <PackageTags>Caching,Cache,Distributed,Redis</PackageTags>
-    <PackageProjectUrl>https://github.com/catcherwong/EasyCaching</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/catcherwong/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/catcherwong/EasyCaching</RepositoryUrl>
-    <ProjectUrl>https://github.com/catcherwong/EasyCaching</ProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/catcherwong/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
+    <ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
     <PackageReleaseNotes>      
-     Add some new caching APIs.
+     Implement GetCount and Flush.
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/EasyCaching.Redis/RedisDatabaseProvider.cs b/src/EasyCaching.Redis/RedisDatabaseProvider.cs
@@ -66,6 +66,7 @@ private ConnectionMultiplexer CreateConnectionMultiplexer()
                 Password = _options.Password,
                 Ssl = _options.IsSsl,
                 SslHost = _options.SslHost,
+                AllowAdmin = _options.AllowAdmin
             };
 
             foreach (var endpoint in _options.Endpoints)

diff --git a/src/EasyCaching.SQLite/ConstSQL.cs b/src/EasyCaching.SQLite/ConstSQL.cs
@@ -57,6 +57,25 @@ FROM [easycaching]
                     FROM [easycaching]
                     WHERE [cachekey] = @cachekey AND [expiration] > strftime('%s','now')";
 
+        /// <summary>
+        /// The countallsql.
+        /// </summary>
+        public const string COUNTALLSQL = @"SELECT COUNT(1)
+            FROM [easycaching]
+            WHERE [expiration] > strftime('%s','now')";
+
+        /// <summary>
+        /// The countprefixsql.
+        /// </summary>
+        public const string COUNTPREFIXSQL = @"SELECT COUNT(1)
+            FROM [easycaching]
+            WHERE [cachekey] like @cachekey AND [expiration] > strftime('%s','now')";
+
+        /// <summary>
+        /// The flushsql.
+        /// </summary>
+        public const string FLUSHSQL = @"DELETE FROM [easycaching]";
+
         /// <summary>
         /// The createsql.
         /// </summary>