Skip to content

Commit 4c9e59f

Browse files
bollhalsbollhals
committed
delete MethodArgumentReader / Writer
1 parent d8a6e62 commit 4c9e59f

Some content is hidden

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

73 files changed

+1
-1131
lines changed

‎Benchmarks/WireFormatting/WireFormatting_Read_BasicAck.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using BenchmarkDotNet.Attributes;
33
using RabbitMQ.Client.Framing.Impl;
4-
using RabbitMQ.Client.Impl;
54

65
namespace Benchmarks.WireFormatting
76
{
@@ -16,15 +15,6 @@ public WireFormatting_Read_BasicAck()
1615
new BasicAck(ulong.MaxValue, true).WriteArgumentsTo(_buffer);
1716
}
1817

19-
[Benchmark]
20-
public object ReadArgumentsFrom_MethodArgumentReader()
21-
{
22-
var reader = new MethodArgumentReader(new ReadOnlySpan<byte>(_buffer));
23-
MethodBase basicAck = new BasicAck();
24-
basicAck.ReadArgumentsFrom(ref reader);
25-
return basicAck;
26-
}
27-
2818
[Benchmark(Baseline = true)]
2919
public object ReadFromSpan()
3020
{

‎Benchmarks/WireFormatting/WireFormatting_Read_BasicDeliver.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using BenchmarkDotNet.Attributes;
3-
using RabbitMQ.Client.Impl;
43
using BasicDeliver = RabbitMQ.Client.Framing.Impl.BasicDeliver;
54

65
namespace Benchmarks.WireFormatting
@@ -16,15 +15,6 @@ public WireFormatting_Read_BasicDeliver()
1615
new BasicDeliver(string.Empty, 0, false, string.Empty, string.Empty).WriteArgumentsTo(_buffer);
1716
}
1817

19-
[Benchmark]
20-
public object ReadArgumentsFrom_MethodArgumentReader()
21-
{
22-
var reader = new MethodArgumentReader(new ReadOnlySpan<byte>(_buffer));
23-
MethodBase basicAck = new BasicDeliver();
24-
basicAck.ReadArgumentsFrom(ref reader);
25-
return basicAck;
26-
}
27-
2818
[Benchmark(Baseline = true)]
2919
public object ReadFromSpan()
3020
{

‎Benchmarks/WireFormatting/WireFormatting_Read_ChannelClose.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using BenchmarkDotNet.Attributes;
33
using RabbitMQ.Client.Framing.Impl;
4-
using RabbitMQ.Client.Impl;
54

65
namespace Benchmarks.WireFormatting
76
{
@@ -16,15 +15,6 @@ public WireFormatting_Read_ChannelClose()
1615
new ChannelClose(333, string.Empty, 0099, 2999).WriteArgumentsTo(_buffer);
1716
}
1817

19-
[Benchmark]
20-
public object ReadArgumentsFrom_MethodArgumentReader()
21-
{
22-
var reader = new MethodArgumentReader(new ReadOnlySpan<byte>(_buffer));
23-
MethodBase basicAck = new ChannelClose();
24-
basicAck.ReadArgumentsFrom(ref reader);
25-
return basicAck;
26-
}
27-
2818
[Benchmark(Baseline = true)]
2919
public object ReadFromSpan()
3020
{

‎Benchmarks/WireFormatting/WireFormatting_Write_BasicAck.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using BenchmarkDotNet.Attributes;
22
using RabbitMQ.Client.Framing.Impl;
3-
using RabbitMQ.Client.Impl;
43

54
namespace Benchmarks.WireFormatting
65
{
@@ -11,14 +10,6 @@ public class WireFormatting_Write_BasicAck
1110
private readonly byte[] _buffer = new byte[1024];
1211
private readonly BasicAck _method = new BasicAck(ulong.MaxValue, true);
1312

14-
[Benchmark]
15-
public int WriteArgumentsTo_MethodArgumentWriter()
16-
{
17-
var writer = new MethodArgumentWriter(_buffer);
18-
_method.WriteArgumentsTo(ref writer);
19-
return writer.Offset;
20-
}
21-
2213
[Benchmark(Baseline = true)]
2314
public int WriteArgumentsTo()
2415
{

‎Benchmarks/WireFormatting/WireFormatting_Write_BasicDeliver.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using RabbitMQ.Client.Impl;
32
using BasicDeliver = RabbitMQ.Client.Framing.Impl.BasicDeliver;
43

54
namespace Benchmarks.WireFormatting
@@ -11,14 +10,6 @@ public class WireFormatting_Write_BasicDeliver
1110
private readonly byte[] _buffer = new byte[1024];
1211
private readonly BasicDeliver _method = new BasicDeliver(string.Empty, 0, false, string.Empty, string.Empty);
1312

14-
[Benchmark]
15-
public int WriteArgumentsTo_MethodArgumentWriter()
16-
{
17-
var writer = new MethodArgumentWriter(_buffer);
18-
_method.WriteArgumentsTo(ref writer);
19-
return writer.Offset;
20-
}
21-
2213
[Benchmark(Baseline = true)]
2314
public int WriteArgumentsTo()
2415
{

‎Benchmarks/WireFormatting/WireFormatting_Write_ChannelClose.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using BenchmarkDotNet.Attributes;
22
using RabbitMQ.Client.Framing.Impl;
3-
using RabbitMQ.Client.Impl;
43

54
namespace Benchmarks.WireFormatting
65
{
@@ -11,14 +10,6 @@ public class WireFormatting_Write_ChannelClose
1110
private readonly byte[] _buffer = new byte[1024];
1211
private readonly ChannelClose _method = new ChannelClose(333, string.Empty, 0099, 2999);
1312

14-
[Benchmark]
15-
public int WriteArgumentsTo_MethodArgumentWriter()
16-
{
17-
var writer = new MethodArgumentWriter(_buffer);
18-
_method.WriteArgumentsTo(ref writer);
19-
return writer.Offset;
20-
}
21-
2213
[Benchmark(Baseline = true)]
2314
public int WriteArgumentsTo()
2415
{

‎projects/RabbitMQ.Client/client/framing/BasicAck.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,6 @@ public BasicAck(ReadOnlySpan<byte> span)
6060
public override string ProtocolMethodName => "basic.ack";
6161
public override bool HasContent => false;
6262

63-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
64-
{
65-
_deliveryTag = reader.ReadLonglong();
66-
_multiple = reader.ReadBit();
67-
}
68-
69-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
70-
{
71-
writer.WriteLonglong(_deliveryTag);
72-
writer.WriteBit(_multiple);
73-
writer.EndBits();
74-
}
75-
7663
public override int WriteArgumentsTo(Span<byte> span)
7764
{
7865
int offset = WireFormatting.WriteLonglong(span, _deliveryTag);

‎projects/RabbitMQ.Client/client/framing/BasicCancel.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,6 @@ public BasicCancel(ReadOnlySpan<byte> span)
6161
public override string ProtocolMethodName => "basic.cancel";
6262
public override bool HasContent => false;
6363

64-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
65-
{
66-
_consumerTag = reader.ReadShortstr();
67-
_nowait = reader.ReadBit();
68-
}
69-
70-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
71-
{
72-
writer.WriteShortstr(_consumerTag);
73-
writer.WriteBit(_nowait);
74-
writer.EndBits();
75-
}
76-
7764
public override int WriteArgumentsTo(Span<byte> span)
7865
{
7966
int offset = WireFormatting.WriteShortstr(span, _consumerTag);

‎projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ public BasicCancelOk(ReadOnlySpan<byte> span)
5858
public override string ProtocolMethodName => "basic.cancel-ok";
5959
public override bool HasContent => false;
6060

61-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
62-
{
63-
_consumerTag = reader.ReadShortstr();
64-
}
65-
66-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
67-
{
68-
writer.WriteShortstr(_consumerTag);
69-
}
70-
7161
public override int WriteArgumentsTo(Span<byte> span)
7262
{
7363
return WireFormatting.WriteShortstr(span, _consumerTag);

‎projects/RabbitMQ.Client/client/framing/BasicConsume.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -78,31 +78,6 @@ public BasicConsume(ReadOnlySpan<byte> span)
7878
public override string ProtocolMethodName => "basic.consume";
7979
public override bool HasContent => false;
8080

81-
public override void ReadArgumentsFrom(ref MethodArgumentReader reader)
82-
{
83-
_reserved1 = reader.ReadShort();
84-
_queue = reader.ReadShortstr();
85-
_consumerTag = reader.ReadShortstr();
86-
_noLocal = reader.ReadBit();
87-
_noAck = reader.ReadBit();
88-
_exclusive = reader.ReadBit();
89-
_nowait = reader.ReadBit();
90-
_arguments = reader.ReadTable();
91-
}
92-
93-
public override void WriteArgumentsTo(ref MethodArgumentWriter writer)
94-
{
95-
writer.WriteShort(_reserved1);
96-
writer.WriteShortstr(_queue);
97-
writer.WriteShortstr(_consumerTag);
98-
writer.WriteBit(_noLocal);
99-
writer.WriteBit(_noAck);
100-
writer.WriteBit(_exclusive);
101-
writer.WriteBit(_nowait);
102-
writer.EndBits();
103-
writer.WriteTable(_arguments);
104-
}
105-
10681
public override int WriteArgumentsTo(Span<byte> span)
10782
{
10883
int offset = WireFormatting.WriteShort(span, _reserved1);

‎projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ public BasicConsumeOk(ReadOnlySpan<byte> span)
5858
public override string ProtocolMethodName => "basic.consume-ok";
5959
public override bool HasContent => false;
6060

61-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
62-
{
63-
_consumerTag = reader.ReadShortstr();
64-
}
65-
66-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
67-
{
68-
writer.WriteShortstr(_consumerTag);
69-
}
70-
7161
public override int WriteArgumentsTo(Span<byte> span)
7262
{
7363
return WireFormatting.WriteShortstr(span, _consumerTag);

‎projects/RabbitMQ.Client/client/framing/BasicDeliver.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,6 @@ public BasicDeliver(ReadOnlySpan<byte> span)
7171
public override string ProtocolMethodName => "basic.deliver";
7272
public override bool HasContent => true;
7373

74-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
75-
{
76-
_consumerTag = reader.ReadShortstr();
77-
_deliveryTag = reader.ReadLonglong();
78-
_redelivered = reader.ReadBit();
79-
_exchange = reader.ReadShortstr();
80-
_routingKey = reader.ReadShortstr();
81-
}
82-
83-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
84-
{
85-
writer.WriteShortstr(_consumerTag);
86-
writer.WriteLonglong(_deliveryTag);
87-
writer.WriteBit(_redelivered);
88-
writer.EndBits();
89-
writer.WriteShortstr(_exchange);
90-
writer.WriteShortstr(_routingKey);
91-
}
92-
9374
public override int WriteArgumentsTo(Span<byte> span)
9475
{
9576
int offset = WireFormatting.WriteShortstr(span, _consumerTag);

‎projects/RabbitMQ.Client/client/framing/BasicGet.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,6 @@ public BasicGet(ReadOnlySpan<byte> span)
6464
public override string ProtocolMethodName => "basic.get";
6565
public override bool HasContent => false;
6666

67-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
68-
{
69-
_reserved1 = reader.ReadShort();
70-
_queue = reader.ReadShortstr();
71-
_noAck = reader.ReadBit();
72-
}
73-
74-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
75-
{
76-
writer.WriteShort(_reserved1);
77-
writer.WriteShortstr(_queue);
78-
writer.WriteBit(_noAck);
79-
writer.EndBits();
80-
}
81-
8267
public override int WriteArgumentsTo(Span<byte> span)
8368
{
8469
int offset = WireFormatting.WriteShort(span, _reserved1);

‎projects/RabbitMQ.Client/client/framing/BasicGetEmpty.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ public BasicGetEmpty(ReadOnlySpan<byte> span)
5858
public override string ProtocolMethodName => "basic.get-empty";
5959
public override bool HasContent => false;
6060

61-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
62-
{
63-
_reserved1 = reader.ReadShortstr();
64-
}
65-
66-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
67-
{
68-
writer.WriteShortstr(_reserved1);
69-
}
70-
7161
public override int WriteArgumentsTo(Span<byte> span)
7262
{
7363
return WireFormatting.WriteShortstr(span, _reserved1);

‎projects/RabbitMQ.Client/client/framing/BasicGetOk.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,6 @@ public BasicGetOk(ReadOnlySpan<byte> span)
7070
public override string ProtocolMethodName => "basic.get-ok";
7171
public override bool HasContent => true;
7272

73-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
74-
{
75-
_deliveryTag = reader.ReadLonglong();
76-
_redelivered = reader.ReadBit();
77-
_exchange = reader.ReadShortstr();
78-
_routingKey = reader.ReadShortstr();
79-
_messageCount = reader.ReadLong();
80-
}
81-
82-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
83-
{
84-
writer.WriteLonglong(_deliveryTag);
85-
writer.WriteBit(_redelivered);
86-
writer.EndBits();
87-
writer.WriteShortstr(_exchange);
88-
writer.WriteShortstr(_routingKey);
89-
writer.WriteLong(_messageCount);
90-
}
91-
9273
public override int WriteArgumentsTo(Span<byte> span)
9374
{
9475
int offset = WireFormatting.WriteLonglong(span, _deliveryTag);

‎projects/RabbitMQ.Client/client/framing/BasicNack.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,6 @@ public BasicNack(ReadOnlySpan<byte> span)
6262
public override string ProtocolMethodName => "basic.nack";
6363
public override bool HasContent => false;
6464

65-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
66-
{
67-
_deliveryTag = reader.ReadLonglong();
68-
_multiple = reader.ReadBit();
69-
_requeue = reader.ReadBit();
70-
}
71-
72-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
73-
{
74-
writer.WriteLonglong(_deliveryTag);
75-
writer.WriteBit(_multiple);
76-
writer.WriteBit(_requeue);
77-
writer.EndBits();
78-
}
79-
8065
public override int WriteArgumentsTo(Span<byte> span)
8166
{
8267
int offset = WireFormatting.WriteLonglong(span, _deliveryTag);

‎projects/RabbitMQ.Client/client/framing/BasicPublish.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,6 @@ public BasicPublish(ReadOnlySpan<byte> span)
6969
public override string ProtocolMethodName => "basic.publish";
7070
public override bool HasContent => true;
7171

72-
public override void ReadArgumentsFrom(ref Client.Impl.MethodArgumentReader reader)
73-
{
74-
_reserved1 = reader.ReadShort();
75-
_exchange = reader.ReadShortstr();
76-
_routingKey = reader.ReadShortstr();
77-
_mandatory = reader.ReadBit();
78-
_immediate = reader.ReadBit();
79-
}
80-
81-
public override void WriteArgumentsTo(ref Client.Impl.MethodArgumentWriter writer)
82-
{
83-
writer.WriteShort(_reserved1);
84-
writer.WriteShortstr(_exchange);
85-
writer.WriteShortstr(_routingKey);
86-
writer.WriteBit(_mandatory);
87-
writer.WriteBit(_immediate);
88-
writer.EndBits();
89-
}
90-
9172
public override int WriteArgumentsTo(Span<byte> span)
9273
{
9374
int offset = WireFormatting.WriteShort(span, _reserved1);

0 commit comments

Comments
 (0)