Skip to content

Commit bd0a742

Browse files
committed
* Make conversion from ConsumerTag to string explicit
* Replace `string` with `ConsumerTag`
1 parent aed97b4 commit bd0a742

Some content is hidden

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

41 files changed

+331
-252
lines changed

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)
1818
_autoResetEvent = autoResetEvent;
1919
}
2020

21-
public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, ReadOnlyMemory<byte> exchange, ReadOnlyMemory<byte> routingKey,
21+
public Task HandleBasicDeliver(ConsumerTag consumerTag, ulong deliveryTag, bool redelivered,
22+
ExchangeName exchange, RoutingKey routingKey,
2223
in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
2324
{
2425
if (Interlocked.Increment(ref _current) == Count)
@@ -29,7 +30,8 @@ public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redel
2930
return Task.CompletedTask;
3031
}
3132

32-
Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, ReadOnlyMemory<byte> exchange, ReadOnlyMemory<byte> routingKey,
33+
Task IBasicConsumer.HandleBasicDeliverAsync(ConsumerTag consumerTag, ulong deliveryTag, bool redelivered,
34+
ExchangeName exchange, RoutingKey routingKey,
3335
ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
3436
{
3537
if (Interlocked.Increment(ref _current) == Count)
@@ -40,11 +42,11 @@ Task IBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTa
4042
return Task.CompletedTask;
4143
}
4244

43-
public Task HandleBasicCancel(string consumerTag) => Task.CompletedTask;
45+
public Task HandleBasicCancel(ConsumerTag consumerTag) => Task.CompletedTask;
4446

45-
public Task HandleBasicCancelOk(string consumerTag) => Task.CompletedTask;
47+
public Task HandleBasicCancelOk(ConsumerTag consumerTag) => Task.CompletedTask;
4648

47-
public Task HandleBasicConsumeOk(string consumerTag) => Task.CompletedTask;
49+
public Task HandleBasicConsumeOk(ConsumerTag consumerTag) => Task.CompletedTask;
4850

4951
public Task HandleChannelShutdown(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
5052

@@ -62,19 +64,19 @@ public event AsyncEventHandler<ConsumerEventArgs> ConsumerCancelled
6264
remove { }
6365
}
6466

65-
void IBasicConsumer.HandleBasicCancelOk(string consumerTag)
67+
void IBasicConsumer.HandleBasicCancelOk(ConsumerTag consumerTag)
6668
{
6769
}
6870

69-
void IBasicConsumer.HandleBasicConsumeOk(string consumerTag)
71+
void IBasicConsumer.HandleBasicConsumeOk(ConsumerTag consumerTag)
7072
{
7173
}
7274

7375
void IBasicConsumer.HandleChannelShutdown(object channel, ShutdownEventArgs reason)
7476
{
7577
}
7678

77-
void IBasicConsumer.HandleBasicCancel(string consumerTag)
79+
void IBasicConsumer.HandleBasicCancel(ConsumerTag consumerTag)
7880
{
7981
}
8082
}

projects/Benchmarks/ConsumerDispatching/ConsumerDispatcher.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Text;
32
using System.Threading;
43
using System.Threading.Tasks;
54
using BenchmarkDotNet.Attributes;
@@ -16,11 +15,12 @@ public class ConsumerDispatcherBase
1615

1716
private protected IConsumerDispatcher _dispatcher;
1817
private protected readonly AsyncBasicConsumerFake _consumer = new AsyncBasicConsumerFake(_autoResetEvent);
19-
protected readonly string _consumerTag = "ConsumerTag";
20-
protected static readonly byte[] _consumerTagBytes = Encoding.UTF8.GetBytes("ConsumerTag");
18+
19+
protected static readonly ConsumerTag _consumerTag = new ConsumerTag("ConsumerTag");
20+
protected static readonly ExchangeName _exchange = new ExchangeName("Exchange");
21+
protected static readonly RoutingKey _routingKey = new RoutingKey("RoutingKey");
22+
2123
protected readonly ulong _deliveryTag = 500UL;
22-
protected static readonly byte[] _exchange = Encoding.UTF8.GetBytes("Exchange");
23-
protected static readonly byte[] _routingKey = Encoding.UTF8.GetBytes("RoutingKey");
2424
protected readonly ReadOnlyBasicProperties _properties = new ReadOnlyBasicProperties();
2525
protected readonly byte[] _method = new byte[512];
2626
protected readonly byte[] _body = new byte[512];
@@ -55,7 +55,7 @@ public async Task AsyncConsumerDispatcher()
5555
{
5656
for (int i = 0; i < Count; i++)
5757
{
58-
await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
58+
await _dispatcher.HandleBasicDeliverAsync(_consumerTag, _deliveryTag,
5959
false, _exchange, _routingKey, _properties, body, CancellationToken.None);
6060
}
6161
_autoResetEvent.Wait();
@@ -78,7 +78,7 @@ public async Task ConsumerDispatcher()
7878
{
7979
for (int i = 0; i < Count; i++)
8080
{
81-
await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
81+
await _dispatcher.HandleBasicDeliverAsync(_consumerTag, _deliveryTag,
8282
false, _exchange, _routingKey, _properties, body, CancellationToken.None);
8383
}
8484
_autoResetEvent.Wait();

0 commit comments

Comments
 (0)