Skip to content

Commit dd3732b

Browse files
catcherwongcatcherwong
authored
Merge pull request #89 from dotnetcore/dev
v0.5.3 release
2 parents a45b140 + c92d78f commit dd3732b

30 files changed

+2463
-892
lines changed

‎build/releasenotes.props‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Fixed ReturnValue bugs of Interceptors
4+
1. Support diagnostics.
5+
2. Interceptor should generate valid cache key for basic type parameters
56
</EasyCachingCorePackageNotes>
67
<EasyCachingMemcachedPackageNotes>
7-
1. Fixed ReturnValue bugs of Interceptors
8+
1. Update EasyCaching.Core.
89
</EasyCachingMemcachedPackageNotes>
910
<EasyCachingRedisPackageNotes>
10-
1. Fixed ReturnValue bugs of Interceptors
11+
1. Update EasyCaching.Core.
1112
</EasyCachingRedisPackageNotes>
1213
<EasyCachingSQLitePackageNotes>
13-
1. Fixed ReturnValue bugs of Interceptors
14+
1. Update EasyCaching.Core.
1415
</EasyCachingSQLitePackageNotes>
1516
<EasyCachingInMemoryPackageNotes>
16-
1. Fixed ReturnValue bugs of Interceptors
17+
1. Update EasyCaching.Core.
1718
</EasyCachingInMemoryPackageNotes>
1819
<EasyCachingHybridPackageNotes>
19-
1. Fixed ReturnValue bugs of Interceptors
20+
1. Update EasyCaching.Core.
2021
</EasyCachingHybridPackageNotes>
2122
<EasyCachingAspectCorePackageNotes>
22-
1. Fixed ReturnValue bugs of Interceptors
23+
1. Update EasyCaching.Core.
2324
</EasyCachingAspectCorePackageNotes>
2425
<EasyCachingCastlePackageNotes>
25-
1. Fixed ReturnValue bugs of Interceptors
26+
1. Update EasyCaching.Core.
2627
</EasyCachingCastlePackageNotes>
2728
<EasyCachingResponseCachingPackageNotes>
2829
1. Update EasyCaching.Core.
2930
</EasyCachingResponseCachingPackageNotes>
3031
<EasyCachingJsonPackageNotes>
31-
1. Fixed ReturnValue bugs of Interceptors
32+
1. Update EasyCaching.Core.
3233
</EasyCachingJsonPackageNotes>
3334
<EasyCachingMessagePackPackageNotes>
34-
1. Fixed ReturnValue bugs of Interceptors
35+
1. Update EasyCaching.Core.
3536
</EasyCachingMessagePackPackageNotes>
3637
<EasyCachingProtobufPackageNotes>
37-
1. Fixed ReturnValue bugs of Interceptors
38+
1. Update EasyCaching.Core.
3839
</EasyCachingProtobufPackageNotes>
3940
<EasyCachingCSRedisPackageNotes>
40-
1. Fixed ReturnValue bugs of Interceptors
41+
1. Update EasyCaching.Core.
4142
</EasyCachingCSRedisPackageNotes>
4243
<EasyCachingRedisBusPackageNotes>
4344
1. Update EasyCaching.Core.

‎build/version.props‎

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

‎src/EasyCaching.Bus.CSRedis/DefaultCSRedisBus.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
using System.Linq;
66
using System.Threading;
77
using System.Threading.Tasks;
8+
using EasyCaching.Core;
89
using EasyCaching.Core.Bus;
910
using Newtonsoft.Json;
1011

11-
public class DefaultCSRedisBus : IEasyCachingBus
12+
public class DefaultCSRedisBus : EasyCachingAbstractBus
1213
{
1314
/// <summary>
1415
/// The cache.
1516
/// </summary>
1617
private readonly EasyCachingCSRedisClient _client;
1718

18-
/// <summary>
19-
/// The handler.
20-
/// </summary>
21-
private Action<EasyCachingMessage> _handler;
22-
2319
/// <summary>
2420
/// Initializes a new instance of the <see cref="T:EasyCaching.Bus.CSRedis.DefaultCSRedisBus"/> class.
2521
/// </summary>
@@ -34,7 +30,7 @@ public DefaultCSRedisBus(IEnumerable<EasyCachingCSRedisClient> clients)
3430
/// </summary>
3531
/// <param name="topic">Topic.</param>
3632
/// <param name="message">Message.</param>
37-
public void Publish(string topic, EasyCachingMessage message)
33+
public override void BasePublish(string topic, EasyCachingMessage message)
3834
{
3935
var msg = JsonConvert.SerializeObject(message);
4036

@@ -48,7 +44,7 @@ public void Publish(string topic, EasyCachingMessage message)
4844
/// <param name="topic">Topic.</param>
4945
/// <param name="message">Message.</param>
5046
/// <param name="cancellationToken">Cancellation token.</param>
51-
public async Task PublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
47+
public override async Task BasePublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
5248
{
5349
var msg = JsonConvert.SerializeObject(message);
5450

@@ -60,10 +56,8 @@ public void Publish(string topic, EasyCachingMessage message)
6056
/// </summary>
6157
/// <param name="topic">Topic.</param>
6258
/// <param name="action">Action.</param>
63-
public void Subscribe(string topic, Action<EasyCachingMessage> action)
59+
public override void BaseSubscribe(string topic, Action<EasyCachingMessage> action)
6460
{
65-
_handler = action;
66-
6761
_client.Subscribe(
6862
(topic, msg => OnMessage(msg.Body))
6963
);
@@ -77,7 +71,7 @@ private void OnMessage(string body)
7771
{
7872
var message = JsonConvert.DeserializeObject<EasyCachingMessage>(body);
7973

80-
_handler?.Invoke(message);
74+
BaseOnMessage(message);
8175
}
8276
}
8377
}

‎src/EasyCaching.Bus.RabbitMQ/DefaultRabbitMQBus.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System;
44
using System.Threading;
55
using System.Threading.Tasks;
6+
using EasyCaching.Core;
67
using EasyCaching.Core.Bus;
78
using EasyCaching.Core.Serialization;
89
using global::RabbitMQ.Client;
@@ -13,7 +14,7 @@
1314
/// <summary>
1415
/// Default RabbitMQ Bus.
1516
/// </summary>
16-
public class DefaultRabbitMQBus : IEasyCachingBus
17+
public class DefaultRabbitMQBus : EasyCachingAbstractBus
1718
{
1819
/// <summary>
1920
/// The subscriber connection.
@@ -25,11 +26,6 @@ public class DefaultRabbitMQBus : IEasyCachingBus
2526
/// </summary>
2627
private readonly ObjectPool<IConnection> _pubConnectionPool;
2728

28-
/// <summary>
29-
/// The handler.
30-
/// </summary>
31-
private Action<EasyCachingMessage> _handler;
32-
3329
/// <summary>
3430
/// The rabbitMQ Bus options.
3531
/// </summary>
@@ -83,7 +79,7 @@ IPooledObjectPolicy<IConnection> _objectPolicy
8379
/// </summary>
8480
/// <param name="topic">Topic.</param>
8581
/// <param name="message">Message.</param>
86-
public void Publish(string topic, EasyCachingMessage message)
82+
public override void BasePublish(string topic, EasyCachingMessage message)
8783
{
8884
var conn = _pubConnectionPool.Get();
8985

@@ -112,7 +108,7 @@ public void Publish(string topic, EasyCachingMessage message)
112108
/// <param name="topic">Topic.</param>
113109
/// <param name="message">Message.</param>
114110
/// <param name="cancellationToken">Cancellation token.</param>
115-
public Task PublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
111+
public override Task BasePublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
116112
{
117113
var conn = _pubConnectionPool.Get();
118114
try
@@ -139,9 +135,8 @@ public void Publish(string topic, EasyCachingMessage message)
139135
/// </summary>
140136
/// <param name="topic">Topic.</param>
141137
/// <param name="action">Action.</param>
142-
public void Subscribe(string topic, Action<EasyCachingMessage> action)
138+
public override void BaseSubscribe(string topic, Action<EasyCachingMessage> action)
143139
{
144-
_handler = action;
145140
var queueName = string.Empty;
146141
if (string.IsNullOrWhiteSpace(_options.QueueName))
147142
{
@@ -187,7 +182,7 @@ private void OnMessage(object sender, BasicDeliverEventArgs e)
187182
{
188183
var message = _serializer.Deserialize<EasyCachingMessage>(e.Body);
189184

190-
_handler?.Invoke(message);
185+
BaseOnMessage(message);
191186
}
192187
}
193188
}

‎src/EasyCaching.Bus.Redis/DefaultRedisBus.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// <summary>
1212
/// Default redis bus.
1313
/// </summary>
14-
public class DefaultRedisBus : IEasyCachingBus
14+
public class DefaultRedisBus : EasyCachingAbstractBus
1515
{
1616
/// <summary>
1717
/// The subscriber.
@@ -23,11 +23,6 @@ public class DefaultRedisBus : IEasyCachingBus
2323
/// </summary>
2424
private readonly IRedisSubscriberProvider _subscriberProvider;
2525

26-
/// <summary>
27-
/// The handler.
28-
/// </summary>
29-
private Action<EasyCachingMessage> _handler;
30-
3126
/// <summary>
3227
/// The serializer.
3328
/// </summary>
@@ -56,15 +51,15 @@ private void OnMessage(RedisChannel channel, RedisValue value)
5651
{
5752
var message = _serializer.Deserialize<EasyCachingMessage>(value);
5853

59-
_handler?.Invoke(message);
54+
BaseOnMessage(message);
6055
}
6156

6257
/// <summary>
6358
/// Publish the specified topic and message.
6459
/// </summary>
6560
/// <param name="topic">Topic.</param>
6661
/// <param name="message">Message.</param>
67-
public void Publish(string topic, EasyCachingMessage message)
62+
public override void BasePublish(string topic, EasyCachingMessage message)
6863
{
6964
ArgumentCheck.NotNullOrWhiteSpace(topic, nameof(topic));
7065

@@ -78,7 +73,7 @@ public void Publish(string topic, EasyCachingMessage message)
7873
/// <param name="topic">Topic.</param>
7974
/// <param name="message">Message.</param>
8075
/// <param name="cancellationToken">Cancellation token.</param>
81-
public async Task PublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
76+
public override async Task BasePublishAsync(string topic, EasyCachingMessage message, CancellationToken cancellationToken = default(CancellationToken))
8277
{
8378
ArgumentCheck.NotNullOrWhiteSpace(topic, nameof(topic));
8479

@@ -90,9 +85,8 @@ public void Publish(string topic, EasyCachingMessage message)
9085
/// </summary>
9186
/// <param name="topic">Topic.</param>
9287
/// <param name="action">Action.</param>
93-
public void Subscribe(string topic, Action<EasyCachingMessage> action)
88+
public override void BaseSubscribe(string topic, Action<EasyCachingMessage> action)
9489
{
95-
_handler = action;
9690
_subscriber.Subscribe(topic, OnMessage);
9791
}
9892
}

‎src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.SortedSet.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
public partial class DefaultCSRedisCachingProvider : IRedisCachingProvider
99
{
10-
1110
public long ZAdd<T>(string cacheKey, Dictionary<T, double> cacheValues)
1211
{
1312
ArgumentCheck.NotNullOrWhiteSpace(cacheKey, nameof(cacheKey));

0 commit comments

Comments
 (0)