Skip to content

Commit aec41a2

Browse files
catcherwongcatcherwong
authored
Merge pull request #133 from dotnetcore/dev
v0.6.0
2 parents 4f599ac + 68c8abc commit aec41a2

File tree

83 files changed

+1956
-677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1956
-677
lines changed

‎EasyCaching.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.CSRedis", "src\
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Bus.CSRedis", "src\EasyCaching.Bus.CSRedis\EasyCaching.Bus.CSRedis.csproj", "{861E5373-BEF6-4AA2-92C7-8F4941A079E7}"
5151
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Disk", "src\EasyCaching.Disk\EasyCaching.Disk.csproj", "{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}"
53+
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5456
Debug|Any CPU = Debug|Any CPU
@@ -139,6 +141,10 @@ Global
139141
{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
140142
{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
141143
{861E5373-BEF6-4AA2-92C7-8F4941A079E7}.Release|Any CPU.Build.0 = Release|Any CPU
144+
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476}.Release|Any CPU.Build.0 = Release|Any CPU
142148
EndGlobalSection
143149
GlobalSection(NestedProjects) = preSolution
144150
{CE61FAA2-0233-451C-991D-4222ED61C84B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
@@ -162,5 +168,6 @@ Global
162168
{6EBE36A2-F128-4C63-B90A-B700D8C2F2E8} = {EBB55F65-7D07-4281-8D5E-7B0CA88E1AD0}
163169
{6584761E-E51C-408F-BE51-CA0F6269589B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
164170
{861E5373-BEF6-4AA2-92C7-8F4941A079E7} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
171+
{3D48FD75-01D6-44F9-B7C3-CB6DE784F476} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
165172
EndGlobalSection
166173
EndGlobal

‎build/releasenotes.props‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,44 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageNotes>
4-
1. fix typo: IsHightAvailability -> IsHighAvailability.
3+
<EasyCachingCorePackageNotes>
4+
1. Named Serializer
5+
2. Add a new CachingProviderType for DiskCachingProvider
6+
3. Remove Refresh/RefreshAsync methods
7+
4. HybridCachingProvider add GetAsync method with type
58
</EasyCachingCorePackageNotes>
69
<EasyCachingMemcachedPackageNotes>
710
1. Upgrading dependencies.
11+
2. Remove Refresh/RefreshAsync methods
812
</EasyCachingMemcachedPackageNotes>
913
<EasyCachingRedisPackageNotes>
10-
1. Fixed zrange error.
14+
1. Upgrading dependencies.
15+
2. Remove Refresh/RefreshAsync methods
1116
</EasyCachingRedisPackageNotes>
1217
<EasyCachingSQLitePackageNotes>
1318
1. Upgrading dependencies.
19+
2. Remove Refresh/RefreshAsync methods
1420
</EasyCachingSQLitePackageNotes>
1521
<EasyCachingInMemoryPackageNotes>
1622
1. Upgrading dependencies.
23+
2. Remove Refresh/RefreshAsync methods
1724
</EasyCachingInMemoryPackageNotes>
1825
<EasyCachingHybridPackageNotes>
19-
1. Can be downgraded to LocalCacheProvider.
26+
1. Upgrading dependencies.
27+
2. Remove Refresh/RefreshAsync methods
2028
</EasyCachingHybridPackageNotes>
2129
<EasyCachingAspectCorePackageNotes>
2230
1. Upgrading dependencies.
31+
2. Remove Refresh/RefreshAsync methods
2332
</EasyCachingAspectCorePackageNotes>
2433
<EasyCachingCastlePackageNotes>
2534
1. Upgrading dependencies.
35+
2. Remove Refresh/RefreshAsync methods
2636
</EasyCachingCastlePackageNotes>
2737
<EasyCachingResponseCachingPackageNotes>
28-
1. Upgrading dependencies.
38+
1. Upgrading dependencies.
2939
</EasyCachingResponseCachingPackageNotes>
3040
<EasyCachingJsonPackageNotes>
31-
1. Upgrading dependencies.
41+
1. Upgrading dependencies.
3242
</EasyCachingJsonPackageNotes>
3343
<EasyCachingMessagePackPackageNotes>
3444
1. Upgrading dependencies.
@@ -38,12 +48,16 @@
3848
</EasyCachingProtobufPackageNotes>
3949
<EasyCachingCSRedisPackageNotes>
4050
1. Upgrading dependencies.
51+
2. Remove Refresh/RefreshAsync methods
4152
</EasyCachingCSRedisPackageNotes>
4253
<EasyCachingRedisBusPackageNotes>
4354
1. Upgrading dependencies.
4455
</EasyCachingRedisBusPackageNotes>
4556
<EasyCachingRabbitBusPackageNotes>
4657
1. Upgrading dependencies.
4758
</EasyCachingRabbitBusPackageNotes>
59+
<EasyCachingDiskPackageNotes>
60+
1. init.
61+
</EasyCachingDiskPackageNotes>
4862
</PropertyGroup>
4963
</Project>

‎build/version.props‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>0.5.6</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>0.5.6</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>0.5.6.1</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>0.5.6</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>0.5.6</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>0.5.6.1</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>0.5.6</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>0.5.6</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>0.5.6</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>0.5.6</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>0.5.6</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>0.5.6</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>0.5.6</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>0.5.6</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>0.5.6</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>0.5.6</EasyCachingRabbitBusPackageVersion>
3+
<EasyCachingCorePackageVersion>0.6.0</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>0.6.0</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>0.6.0</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>0.6.0</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>0.6.0</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>0.6.0</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>0.6.0</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>0.6.0</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>0.6.0</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>0.6.0</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>0.6.0</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>0.6.0</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>0.6.0</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>0.6.0</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>0.6.0</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>0.6.0</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingDiskPackageVersion>0.6.0</EasyCachingDiskPackageVersion>
1920
</PropertyGroup>
2021
</Project>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Import Project="../../build/releasenotes.props" />
44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6-
<Owners>Catcher Wong</Owners>
7-
<Authors>Catcher Wong</Authors>
6+
<Owners>ncc;Catcher Wong</Owners>
7+
<Authors>ncc;Catcher Wong</Authors>
88
<Version>$(EasyCachingRedisBusPackageVersion)</Version>
99
<Description>
1010
A simple caching bus(message bus) based on CSRedis.
1111
</Description>
1212
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
1313
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
14-
<PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
14+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1515
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
1616
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
1717
<PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -26,7 +26,11 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="CSRedisCore" Version="3.0.52" />
29+
<None Include="../../LICENSE" Pack="true" PackagePath="" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<PackageReference Include="CSRedisCore" Version="3.0.62" />
3034
</ItemGroup>
3135
<ItemGroup>
3236
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Import Project="../../build/releasenotes.props" />
44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6-
<Owners>Catcher Wong</Owners>
7-
<Authors>Catcher Wong</Authors>
6+
<Owners>ncc;Catcher Wong</Owners>
7+
<Authors>ncc;Catcher Wong</Authors>
88
<Version>$(EasyCachingRabbitBusPackageVersion)</Version>
99
<Description>
1010
A simple caching bus(message bus) based on RabbitMQ.
1111
</Description>
1212
<PackageTags>Bus,Hybrid,RabbitMQ,Caching,Cache</PackageTags>
1313
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
14-
<PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
14+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1515
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
1616
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
1717
<PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -25,13 +25,19 @@
2525
<NoWarn>$(NoWarn);1591</NoWarn>
2626
</PropertyGroup>
2727

28+
<ItemGroup>
29+
<None Include="../../LICENSE" Pack="true" PackagePath="" />
30+
</ItemGroup>
31+
2832
<ItemGroup>
2933
<ProjectReference Include="..\EasyCaching.Core\EasyCaching.Core.csproj" />
3034
</ItemGroup>
35+
3136
<ItemGroup>
3237
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
3338
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.2.0" />
3439
</ItemGroup>
40+
3541
<ItemGroup>
3642
<Folder Include="Configurations\" />
3743
</ItemGroup>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Import Project="../../build/releasenotes.props" />
44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6-
<Owners>Catcher Wong</Owners>
7-
<Authors>Catcher Wong</Authors>
6+
<Owners>ncc;Catcher Wong</Owners>
7+
<Authors>ncc;Catcher Wong</Authors>
88
<Version>$(EasyCachingRedisBusPackageVersion)</Version>
99
<Description>
1010
A simple caching bus(message bus) based on StackExchange.Redis.
1111
</Description>
1212
<PackageTags>Bus,Hybrid,Redis,Caching,Cache</PackageTags>
1313
<PackageProjectUrl>https://github.com/dotnetcore/EasyCaching</PackageProjectUrl>
14-
<PackageLicenseUrl>https://github.com/dotnetcore/EasyCaching/blob/master/LICENSE</PackageLicenseUrl>
14+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1515
<RepositoryUrl>https://github.com/dotnetcore/EasyCaching</RepositoryUrl>
1616
<ProjectUrl>https://github.com/dotnetcore/EasyCaching</ProjectUrl>
1717
<PackageIconUrl>https://raw.githubusercontent.com/dotnetcore/EasyCaching/master/media/nuget-icon.png</PackageIconUrl>
@@ -25,6 +25,9 @@
2525
<NoWarn>$(NoWarn);1591</NoWarn>
2626
</PropertyGroup>
2727

28+
<ItemGroup>
29+
<None Include="../../LICENSE" Pack="true" PackagePath="" />
30+
</ItemGroup>
2831
<ItemGroup>
2932
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
3033
</ItemGroup>

‎src/EasyCaching.CSRedis/Configurations/EasyCachingOptionsExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ public static EasyCachingOptions UseCSRedis(this EasyCachingOptions options, ICo
4141

4242
void configure(RedisOptions x)
4343
{
44-
x.CachingProviderType = redisOptions.CachingProviderType;
4544
x.EnableLogging = redisOptions.EnableLogging;
4645
x.MaxRdSecond = redisOptions.MaxRdSecond;
47-
x.Order = redisOptions.Order;
4846
x.DBConfig = redisOptions.DBConfig;
4947
}
5048

‎src/EasyCaching.CSRedis/Configurations/RedisOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class RedisOptions : BaseProviderOptions
77
{
88
public RedisOptions()
99
{
10-
this.CachingProviderType = CachingProviderType.Redis;
10+
1111
}
1212

1313
/// <summary>

‎src/EasyCaching.CSRedis/Configurations/RedisOptionsExtension.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public void AddServices(IServiceCollection services)
7575
Func<IServiceProvider, DefaultCSRedisCachingProvider> createFactory = x =>
7676
{
7777
var clients = x.GetServices<EasyCachingCSRedisClient>();
78-
var serializer = x.GetRequiredService<IEasyCachingSerializer>();
78+
var serializers = x.GetServices<IEasyCachingSerializer>();
7979
var optionsMon = x.GetRequiredService<IOptionsMonitor<RedisOptions>>();
8080
var options = optionsMon.Get(_name);
8181
var factory = x.GetService<ILoggerFactory>();
82-
return new DefaultCSRedisCachingProvider(_name, clients, serializer, options, factory);
82+
return new DefaultCSRedisCachingProvider(_name, clients, serializers, options, factory);
8383
};
8484

8585
services.AddSingleton<IEasyCachingProvider, DefaultCSRedisCachingProvider>(createFactory);

‎src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.cs‎

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,30 @@ public partial class DefaultCSRedisCachingProvider : EasyCachingAbstractProvider
4848
/// </summary>
4949
/// <param name="name">Name.</param>
5050
/// <param name="clients">Clients.</param>
51-
/// <param name="serializer">Serializer.</param>
51+
/// <param name="serializers">Serializers.</param>
5252
/// <param name="options">Options.</param>
5353
/// <param name="loggerFactory">Logger factory.</param>
5454
public DefaultCSRedisCachingProvider(
5555
string name,
5656
IEnumerable<EasyCachingCSRedisClient> clients,
57-
IEasyCachingSerializer serializer,
57+
IEnumerable<IEasyCachingSerializer> serializers,
5858
RedisOptions options,
5959
ILoggerFactory loggerFactory = null)
6060
{
6161
this._name = name;
62-
this._serializer = serializer;
62+
this._serializer = serializers.FirstOrDefault(x => x.Name.Equals(_name)) ?? serializers.Single(x => x.Name.Equals(EasyCachingConstValue.DefaultSerializerName));
6363
this._options = options;
6464
this._logger = loggerFactory?.CreateLogger<DefaultCSRedisCachingProvider>();
6565
this._cache = clients.Single(x => x.Name.Equals(_name));
6666
this._cacheStats = new CacheStats();
6767

6868
this.ProviderName = this._name;
69+
this.ProviderType = CachingProviderType.Redis;
6970
this.ProviderStats = this._cacheStats;
70-
this.ProviderType = _options.CachingProviderType;
71-
this.ProviderOrder = _options.Order;
7271
this.ProviderMaxRdSecond = _options.MaxRdSecond;
7372
this.IsDistributedProvider = true;
7473
}
75-
74+
7675
/// <summary>
7776
/// Exists the specified cacheKey.
7877
/// </summary>
@@ -498,42 +497,7 @@ public override int BaseGetCount(string prefix = "")
498497

499498
return this.SearchRedisKeys(this.HandlePrefix(prefix)).Length;
500499
}
501-
502-
/// <summary>
503-
/// Refresh the specified cacheKey, cacheValue and expiration.
504-
/// </summary>
505-
/// <param name="cacheKey">Cache key.</param>
506-
/// <param name="cacheValue">Cache value.</param>
507-
/// <param name="expiration">Expiration.</param>
508-
/// <typeparam name="T">The 1st type parameter.</typeparam>
509-
public override void BaseRefresh<T>(string cacheKey, T cacheValue, TimeSpan expiration)
510-
{
511-
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
512-
ArgumentCheck.NotNull(cacheValue, nameof(cacheValue));
513-
ArgumentCheck.NotNegativeOrZero(expiration, nameof(expiration));
514-
515-
this.Remove(cacheKey);
516-
this.Set(cacheKey, cacheValue, expiration);
517-
}
518-
519-
/// <summary>
520-
/// Refreshs the async.
521-
/// </summary>
522-
/// <returns>The async.</returns>
523-
/// <param name="cacheKey">Cache key.</param>
524-
/// <param name="cacheValue">Cache value.</param>
525-
/// <param name="expiration">Expiration.</param>
526-
/// <typeparam name="T">The 1st type parameter.</typeparam>
527-
public override async Task BaseRefreshAsync<T>(string cacheKey, T cacheValue, TimeSpan expiration)
528-
{
529-
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));
530-
ArgumentCheck.NotNull(cacheValue, nameof(cacheValue));
531-
ArgumentCheck.NotNegativeOrZero(expiration, nameof(expiration));
532-
533-
await this.RemoveAsync(cacheKey);
534-
await this.SetAsync(cacheKey, cacheValue, expiration);
535-
}
536-
500+
537501
/// <summary>
538502
/// Remove the specified cacheKey.
539503
/// </summary>

0 commit comments

Comments
 (0)