Merge pull request dotnetcore#107 from dotnetcore/dev

v0.5.4.2 Release

ToDoList.md

@@ -26,6 +26,7 @@
 - [x] GetCount
 - [x] Flush/FlushAsync
 - [x] TrySet/TrySetAsync
+- [ ] GetExpiration/GetExpirationAsync
 - [ ] Others...
 
 ## Serializer Extensions 

build/releasenotes.props

@@ -1,50 +1,59 @@
 <Project>
  <PropertyGroup>
- <EasyCachingCorePackageNotes> 
- 1. Add GenerateDocumentationFile. 
+ <EasyCachingCorePackageNotes> 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
+ 2. IEasyCachingProviderFactory support multi redis provider instances.
+ 3. IRedisCachingProvider add some string and keys methods.
+ 4. Interceptor attribute add cache provider
  </EasyCachingCorePackageNotes>
  <EasyCachingMemcachedPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
  </EasyCachingMemcachedPackageNotes>
  <EasyCachingRedisPackageNotes> 
- 1. Add GenerateDocumentationFile. 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
+ 2. Add some string and keys methods.
  </EasyCachingRedisPackageNotes>
  <EasyCachingSQLitePackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
  </EasyCachingSQLitePackageNotes>
  <EasyCachingInMemoryPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
  </EasyCachingInMemoryPackageNotes>
  <EasyCachingHybridPackageNotes>
- 1. Add GenerateDocumentationFile. 
- 2. Fixed bug of Unable to resolve service for type 'EasyCaching.HybridCache.HybridCachingOptions'
+ 1. Add DefaultExpirationForTtlFailed for HybridCachingOptions.
+ 2. Get distributed cached item's expiration when local cache is null.
  </EasyCachingHybridPackageNotes>
  <EasyCachingAspectCorePackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
+ 2. Swich caching provider via attribute.
+ 3. Handle exception when method return null.
  </EasyCachingAspectCorePackageNotes>
  <EasyCachingCastlePackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
+ 2. Swich caching provider via attribute.
+ 3. Handle exception when method return null.
  </EasyCachingCastlePackageNotes>
  <EasyCachingResponseCachingPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingResponseCachingPackageNotes>
  <EasyCachingJsonPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingJsonPackageNotes>
  <EasyCachingMessagePackPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingMessagePackPackageNotes>
  <EasyCachingProtobufPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingProtobufPackageNotes>
  <EasyCachingCSRedisPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Add GetExpiration/GetExpirationAsync for caching provider.
+ 2. Add some string and keys methods.
  </EasyCachingCSRedisPackageNotes>
  <EasyCachingRedisBusPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingRedisBusPackageNotes>
  <EasyCachingRabbitBusPackageNotes>
- 1. Add GenerateDocumentationFile. 
+ 1. Update EasyCaching.Core. 
  </EasyCachingRabbitBusPackageNotes>
  </PropertyGroup>
 </Project>

build/version.props

@@ -1,20 +1,20 @@
 <Project>
  <PropertyGroup>
- <EasyCachingCorePackageVersion>0.5.4.1</EasyCachingCorePackageVersion>
- <EasyCachingMemcachedPackageVersion>0.5.4.1</EasyCachingMemcachedPackageVersion>
- <EasyCachingRedisPackageVersion>0.5.4.1</EasyCachingRedisPackageVersion>
- <EasyCachingSQLitePackageVersion>0.5.4.1</EasyCachingSQLitePackageVersion>
- <EasyCachingInMemoryPackageVersion>0.5.4.1</EasyCachingInMemoryPackageVersion>
- <EasyCachingHybridPackageVersion>0.5.4.1</EasyCachingHybridPackageVersion>
- <EasyCachingAspectCorePackageVersion>0.5.4.1</EasyCachingAspectCorePackageVersion>
- <EasyCachingCastlePackageVersion>0.5.4.1</EasyCachingCastlePackageVersion>
- <EasyCachingResponseCachingPackageVersion>0.5.4.1</EasyCachingResponseCachingPackageVersion>
- <EasyCachingJsonPackageVersion>0.5.4.1</EasyCachingJsonPackageVersion>
- <EasyCachingMessagePackPackageVersion>0.5.4.1</EasyCachingMessagePackPackageVersion>
- <EasyCachingProtobufPackageVersion>0.5.4.1</EasyCachingProtobufPackageVersion>
- <EasyCachingCSRedisPackageVersion>0.5.4.1</EasyCachingCSRedisPackageVersion>
- <EasyCachingRedisBusPackageVersion>0.5.4.1</EasyCachingRedisBusPackageVersion>
- <EasyCachingCSRedisBusPackageVersion>0.5.4.1</EasyCachingCSRedisBusPackageVersion>
- <EasyCachingRabbitBusPackageVersion>0.5.4.1</EasyCachingRabbitBusPackageVersion>
+ <EasyCachingCorePackageVersion>0.5.4.2</EasyCachingCorePackageVersion>
+ <EasyCachingMemcachedPackageVersion>0.5.4.2</EasyCachingMemcachedPackageVersion>
+ <EasyCachingRedisPackageVersion>0.5.4.2</EasyCachingRedisPackageVersion>
+ <EasyCachingSQLitePackageVersion>0.5.4.2</EasyCachingSQLitePackageVersion>
+ <EasyCachingInMemoryPackageVersion>0.5.4.2</EasyCachingInMemoryPackageVersion>
+ <EasyCachingHybridPackageVersion>0.5.4.2</EasyCachingHybridPackageVersion>
+ <EasyCachingAspectCorePackageVersion>0.5.4.2</EasyCachingAspectCorePackageVersion>
+ <EasyCachingCastlePackageVersion>0.5.4.2</EasyCachingCastlePackageVersion>
+ <EasyCachingResponseCachingPackageVersion>0.5.4.2</EasyCachingResponseCachingPackageVersion>
+ <EasyCachingJsonPackageVersion>0.5.4.2</EasyCachingJsonPackageVersion>
+ <EasyCachingMessagePackPackageVersion>0.5.4.2</EasyCachingMessagePackPackageVersion>
+ <EasyCachingProtobufPackageVersion>0.5.4.2</EasyCachingProtobufPackageVersion>
+ <EasyCachingCSRedisPackageVersion>0.5.4.2</EasyCachingCSRedisPackageVersion>
+ <EasyCachingRedisBusPackageVersion>0.5.4.2</EasyCachingRedisBusPackageVersion>
+ <EasyCachingCSRedisBusPackageVersion>0.5.4.2</EasyCachingCSRedisBusPackageVersion>
+ <EasyCachingRabbitBusPackageVersion>0.5.4.2</EasyCachingRabbitBusPackageVersion>
  </PropertyGroup>
 </Project>

docs/In-Memory.md

@@ -34,12 +34,12 @@ public class Startup
  option.UseInMemory("default");
 
  // use memory cache with your own configuration
- config.UseInMemory(options=> 
+ config.UseInMemory(options => 
  {
  options.DBConfig = new InMemoryCachingOptions
  {
- // scan time, default value is 1 min
- ExpirationScanFrequency = TimeSpan.FromMinutes(1), 
+ // scan time, default value is 60s
+ ExpirationScanFrequency = 60, 
  // total count of cache items, default value is 10000
  SizeLimit = 100 
  };
@@ -87,7 +87,8 @@ And what we add in `appsettings.json` are as following:
  "MaxRdSecond": 120,
  "Order": 2,
  "DBConfig":{
- "SizeLimit": 10000
+ "SizeLimit": 10000,
+ "ExpirationScanFrequency": 60
  }
  }
 }

src/EasyCaching.Bus.CSRedis/Configurations/CSRedisOptionsExtension.cs

@@ -26,8 +26,7 @@ internal sealed class CSRedisOptionsExtension : IEasyCachingOptionsExtension
 
  /// <summary>
  /// Initializes a new instance of the <see cref="T:EasyCaching.CSRedis.RedisOptionsExtension"/> class.
- /// </summary>
- /// <param name="name">Name.</param>
+ /// </summary> 
  /// <param name="configure">Configure.</param>
  public CSRedisOptionsExtension(Action<CSRedisBusOptions> configure)
  {

src/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj

@@ -8,8 +8,7 @@
  <Version>$(EasyCachingRedisBusPackageVersion)</Version>
  <Description> 
  A simple caching bus(message bus) based on CSRedis.
- </Description>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ </Description> 
  <PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
  <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
  <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
@@ -21,6 +20,11 @@
  </PackageReleaseNotes>
  </PropertyGroup>
 
+ <PropertyGroup>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <NoWarn>$(NoWarn);1591</NoWarn>
+ </PropertyGroup>
+
  <ItemGroup>
  <PackageReference Include="CSRedisCore" Version="3.0.33" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />

src/EasyCaching.Bus.RabbitMQ/Configurations/RabbitMQBusOptions.cs

@@ -6,13 +6,7 @@
  /// RabbitMQ Bus options.
  /// </summary>
  public class RabbitMQBusOptions : BaseRabbitMQOptions
- {
- /// <summary>
- /// Gets or sets the route key.
- /// </summary>
- /// <value>The route key.</value>
- //public string RouteKey { get; set; } = "rmq.queue.undurable.easycaching.subscriber.*";
-
+ { 
  /// <summary>
  /// Gets or sets the name of the queue.
  /// </summary>

src/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj

@@ -8,8 +8,7 @@
  <Version>$(EasyCachingRabbitBusPackageVersion)</Version>
  <Description> 
  A simple caching bus(message bus) based on RabbitMQ.
- </Description>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ </Description> 
  <PackageTags>Bus,Hybrid,RabbitMQ,Caching,Cache</PackageTags>
  <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
  <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
@@ -21,6 +20,11 @@
  </PackageReleaseNotes>
  </PropertyGroup>
 
+ <PropertyGroup>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <NoWarn>$(NoWarn);1591</NoWarn>
+ </PropertyGroup>
+
  <ItemGroup>
  <ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
  </ItemGroup>

src/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj

@@ -8,8 +8,7 @@
  <Version>$(EasyCachingRedisBusPackageVersion)</Version>
  <Description> 
  A simple caching bus(message bus) based on StackExchange.Redis.
- </Description>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ </Description> 
  <PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
  <PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
  <PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
@@ -21,6 +20,11 @@
  </PackageReleaseNotes>
  </PropertyGroup>
 
+ <PropertyGroup>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <NoWarn>$(NoWarn);1591</NoWarn>
+ </PropertyGroup>
+
  <ItemGroup>
  <PackageReference Include="StackExchange.Redis" Version="2.0.519" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />

src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Keys.cs

@@ -0,0 +1,74 @@
+namespace EasyCaching.CSRedis
+{
+ using EasyCaching.Core;
+ using System.Threading.Tasks;
+
+ public partial class DefaultCSRedisCachingProvider : IRedisCachingProvider
+ {
+ public string RedisName => this._name;
+
+ public bool KeyDel(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var count = _cache.Del(cacheKey);
+ return count == 1;
+ }
+
+ public async Task<bool> KeyDelAsync(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var count = await _cache.DelAsync(cacheKey);
+ return count == 1;
+ }
+
+ public bool KeyExpire(string cacheKey, int second)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var flag = _cache.Expire(cacheKey, second);
+ return flag;
+ }
+
+ public async Task<bool> KeyExpireAsync(string cacheKey, int second)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var flag = await _cache.ExpireAsync(cacheKey, second);
+ return flag;
+ }
+
+ public bool KeyExists(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var flag = _cache.Exists(cacheKey);
+ return flag;
+ }
+
+ public async Task<bool> KeyExistsAsync(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var flag = await _cache.ExistsAsync(cacheKey);
+ return flag;
+ }
+
+ public long TTL(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var second = _cache.Ttl(cacheKey);
+ return second;
+ }
+
+ public async Task<long> TTLAsync(string cacheKey)
+ {
+ ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
+
+ var second = await _cache.TtlAsync(cacheKey);
+ return second;
+ }
+ }
+}