* Rename ByteCount to Length to match ReadOnlyMemory

lukebakken · lukebakken · commit 0f2cc890dffe · 2024-05-17T15:00:16.000-07:00
* Assume UTF8 for `AmqpString`
* Use "lazy" feature of `AmqpString` for incoming data like `ConsumerTag`, `ExchangeName` etc
diff --git a/projects/RabbitMQ.Client/PublicAPI.Unshipped.txt b/projects/RabbitMQ.Client/PublicAPI.Unshipped.txt
@@ -71,8 +71,8 @@ override RabbitMQ.Client.ShutdownReportEntry.ToString() -> string
 RabbitMQ.Client.AmqpString
 RabbitMQ.Client.AmqpString.AmqpString() -> void
 RabbitMQ.Client.AmqpString.AmqpString(System.ReadOnlyMemory<byte> stringBytes) -> void
-RabbitMQ.Client.AmqpString.ByteCount.get -> int
 RabbitMQ.Client.AmqpString.IsEmpty.get -> bool
+RabbitMQ.Client.AmqpString.Length.get -> int
 RabbitMQ.Client.AmqpTcpEndpoint
 RabbitMQ.Client.AmqpTcpEndpoint.AddressFamily.get -> System.Net.Sockets.AddressFamily
 RabbitMQ.Client.AmqpTcpEndpoint.AddressFamily.set -> void
@@ -859,8 +859,8 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~override RabbitMQ.Client.ExchangeType.Equals(object obj) -> bool
 ~override RabbitMQ.Client.ExchangeType.ToString() -> string
 ~override RabbitMQ.Client.QueueName.FixUp(string value) -> string
-~RabbitMQ.Client.AmqpString.AmqpString(string value, ushort maxLen, System.Text.Encoding encoding, bool strictValidation = false) -> void
-~RabbitMQ.Client.AmqpString.AmqpString(string value, ushort maxLen, System.Text.Encoding encoding, string validatorRegex, bool strictValidation = false) -> void
+~RabbitMQ.Client.AmqpString.AmqpString(string value, ushort maxLen, bool strictValidation = false) -> void
+~RabbitMQ.Client.AmqpString.AmqpString(string value, ushort maxLen, string validatorRegex, bool strictValidation = false) -> void
 ~RabbitMQ.Client.AmqpString.CompareTo(RabbitMQ.Client.AmqpString other) -> int
 ~RabbitMQ.Client.AmqpString.Contains(string value) -> bool
 ~RabbitMQ.Client.AmqpString.Equals(RabbitMQ.Client.AmqpString other) -> bool
diff --git a/projects/RabbitMQ.Client/client/api/AmqpString.cs b/projects/RabbitMQ.Client/client/api/AmqpString.cs
@@ -37,38 +37,31 @@ namespace RabbitMQ.Client
 {
     public abstract class AmqpString : IEquatable<AmqpString>, IComparable<AmqpString>
     {
+        private static readonly Encoding s_encoding = Encoding.UTF8;
         private string _value;
-        private readonly Encoding _encoding;
         private readonly ReadOnlyMemory<byte> _stringBytes;
-        private readonly int _byteCount;
 
         protected AmqpString()
         {
             _value = string.Empty;
-            _encoding = Encoding.UTF8;
             _stringBytes = ReadOnlyMemory<byte>.Empty;
-            _byteCount = 0;
         }
 
         public AmqpString(ReadOnlyMemory<byte> stringBytes)
         {
             _value = null;
-            _encoding = Encoding.UTF8;
             _stringBytes = stringBytes;
-            _byteCount = _stringBytes.Length;
         }
 
-        public AmqpString(string value, ushort maxLen, Encoding encoding,
+        public AmqpString(string value, ushort maxLen,
             bool strictValidation = false)
-            : this(value, maxLen, encoding, null, strictValidation)
+            : this(value, maxLen, null, strictValidation)
         {
         }
 
-        public AmqpString(string value, ushort maxLen, Encoding encoding, string validatorRegex,
+        public AmqpString(string value, ushort maxLen, string validatorRegex,
             bool strictValidation = false)
         {
-            _encoding = encoding;
-
             /*
              * Note:
              * RabbitMQ does hardly any validation for names, only stripping off CR/LF
@@ -89,22 +82,13 @@ public AmqpString(string value, ushort maxLen, Encoding encoding, string validat
                         throw new ArgumentOutOfRangeException(nameof(value));
                     }
                 }
-
-                if (encoding == Encoding.ASCII)
-                {
-                    if (false == isAscii(value))
-                    {
-                        throw new ArgumentOutOfRangeException(nameof(value));
-                    }
-                }
             }
 
             _value = FixUp(value);
-            _stringBytes = new ReadOnlyMemory<byte>(encoding.GetBytes(value));
-            _byteCount = _stringBytes.Length;
+            _stringBytes = new ReadOnlyMemory<byte>(s_encoding.GetBytes(value));
         }
 
-        public int ByteCount => _byteCount;
+        public int Length => _stringBytes.Length;
 
         internal bool HasString => _value != null;
 
@@ -223,19 +207,13 @@ protected virtual string FixUp(string value)
             return value;
         }
 
-        // TODO remove
-        private static bool isAscii(string value)
-        {
-            return Encoding.UTF8.GetByteCount(value) == value.Length;
-        }
-
         private string Value
         {
             get
             {
                 if (_value == null)
                 {
-                    _value = _encoding.GetString(_stringBytes.ToArray());
+                    _value = s_encoding.GetString(_stringBytes.ToArray());
                 }
                 return _value;
             }
@@ -270,7 +248,7 @@ public ExchangeName(string exchangeName)
         }
 
         public ExchangeName(string exchangeName, bool strictValidation)
-            : base(exchangeName, 127, Encoding.ASCII, "^[a-zA-Z0-9-_.:]*$", strictValidation)
+            : base(exchangeName, 127, "^[a-zA-Z0-9-_.:]*$", strictValidation)
         {
         }
 
@@ -319,7 +297,7 @@ public QueueName(string queueName)
         }
 
         public QueueName(string queueName, bool strictValidation)
-            : base(queueName, 127, Encoding.ASCII, "^[a-zA-Z0-9-_.:]*$", strictValidation)
+            : base(queueName, 127, "^[a-zA-Z0-9-_.:]*$", strictValidation)
         {
         }
 
@@ -367,7 +345,7 @@ public RoutingKey(string routingKey)
         }
 
         public RoutingKey(string routingKey, bool strictValidation)
-            : base(routingKey, 256, Encoding.ASCII, strictValidation)
+            : base(routingKey, 256, strictValidation)
         {
         }
 
@@ -403,7 +381,7 @@ public ConsumerTag(string consumerTag)
         }
 
         public ConsumerTag(string consumerTag, bool strictValidation)
-            : base(consumerTag, 256, Encoding.UTF8, strictValidation)
+            : base(consumerTag, 256, strictValidation)
         {
         }
 
diff --git a/projects/RabbitMQ.Client/client/framing/BasicCancel.cs b/projects/RabbitMQ.Client/client/framing/BasicCancel.cs
@@ -58,14 +58,8 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 1 + 1; // bytes for length of _consumerTag, bit fields
-            bufferSize += _consumerTag.ByteCount; // _consumerTag in bytes
+            bufferSize += _consumerTag.Length; // _consumerTag in bytes
             return bufferSize;
         }
-
-        public static ConsumerTag GetConsumerTag(ReadOnlySpan<byte> span)
-        {
-            _ = WireFormatting.ReadShortstr(span, out string consumerTagStr);
-            return new ConsumerTag(consumerTagStr);
-        }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/framing/BasicConsume.cs b/projects/RabbitMQ.Client/client/framing/BasicConsume.cs
@@ -73,8 +73,8 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1; // bytes for _reserved1, length of _queue, length of _consumerTag, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
-            bufferSize += _consumerTag.ByteCount; // _consumerTag in bytes
+            bufferSize += _queue.Length; // _queue in bytes
+            bufferSize += _consumerTag.Length; // _consumerTag in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
         }
diff --git a/projects/RabbitMQ.Client/client/framing/BasicGet.cs b/projects/RabbitMQ.Client/client/framing/BasicGet.cs
@@ -59,7 +59,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _queue, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
+            bufferSize += _queue.Length; // _queue in bytes
             return bufferSize;
         }
     }
diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeBind.cs b/projects/RabbitMQ.Client/client/framing/ExchangeBind.cs
@@ -70,9 +70,9 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1 + 1; // bytes for _reserved1, length of _destination, length of _source, length of _routingKey, bit fields
-            bufferSize += _destination.ByteCount; // _destination in bytes
-            bufferSize += _source.ByteCount; // _source in bytes
-            bufferSize += _routingKey.ByteCount; // _routingKey in bytes
+            bufferSize += _destination.Length; // _destination in bytes
+            bufferSize += _source.Length; // _source in bytes
+            bufferSize += _routingKey.Length; // _routingKey in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
         }
diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeDeclare.cs b/projects/RabbitMQ.Client/client/framing/ExchangeDeclare.cs
@@ -76,7 +76,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1; // bytes for _reserved1, length of _exchange, length of _type, bit fields
-            bufferSize += _exchange.ByteCount; // _exchange in bytes
+            bufferSize += _exchange.Length; // _exchange in bytes
             bufferSize += _type.ByteCount; // _type in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeDelete.cs b/projects/RabbitMQ.Client/client/framing/ExchangeDelete.cs
@@ -61,7 +61,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _exchange, bit fields
-            bufferSize += _exchange.ByteCount; // _exchange in bytes
+            bufferSize += _exchange.Length; // _exchange in bytes
             return bufferSize;
         }
     }
diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeUnbind.cs b/projects/RabbitMQ.Client/client/framing/ExchangeUnbind.cs
@@ -70,9 +70,9 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1 + 1; // bytes for _reserved1, length of _destination, length of _source, length of _routingKey, bit fields
-            bufferSize += _destination.ByteCount; // _destination in bytes
-            bufferSize += _source.ByteCount; // _source in bytes
-            bufferSize += _routingKey.ByteCount; // _routingKey in bytes
+            bufferSize += _destination.Length; // _destination in bytes
+            bufferSize += _source.Length; // _source in bytes
+            bufferSize += _routingKey.Length; // _routingKey in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
         }
diff --git a/projects/RabbitMQ.Client/client/framing/QueueBind.cs b/projects/RabbitMQ.Client/client/framing/QueueBind.cs
@@ -70,7 +70,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1 + 1; // bytes for _reserved1, length of _queue, length of _exchange, length of _routingKey, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
+            bufferSize += _queue.Length; // _queue in bytes
             bufferSize += WireFormatting.GetByteCount(_exchange); // _exchange in bytes
             bufferSize += WireFormatting.GetByteCount(_routingKey); // _routingKey in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
diff --git a/projects/RabbitMQ.Client/client/framing/QueueDeclare.cs b/projects/RabbitMQ.Client/client/framing/QueueDeclare.cs
@@ -72,7 +72,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _queue, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
+            bufferSize += _queue.Length; // _queue in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
         }
diff --git a/projects/RabbitMQ.Client/client/framing/QueueDelete.cs b/projects/RabbitMQ.Client/client/framing/QueueDelete.cs
@@ -63,7 +63,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _queue, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
+            bufferSize += _queue.Length; // _queue in bytes
             return bufferSize;
         }
     }
diff --git a/projects/RabbitMQ.Client/client/framing/QueuePurge.cs b/projects/RabbitMQ.Client/client/framing/QueuePurge.cs
@@ -59,7 +59,7 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _queue, bit fields
-            bufferSize += _queue.ByteCount; // _queue in bytes
+            bufferSize += _queue.Length; // _queue in bytes
             return bufferSize;
         }
     }
diff --git a/projects/RabbitMQ.Client/client/framing/QueueUnbind.cs b/projects/RabbitMQ.Client/client/framing/QueueUnbind.cs
@@ -67,9 +67,9 @@ public int WriteTo(Span<byte> span)
         public int GetRequiredBufferSize()
         {
             int bufferSize = 2 + 1 + 1 + 1; // bytes for _reserved1, length of _queue, length of _exchange, length of _routingKey
-            bufferSize += _queue.ByteCount; // _queue in bytes
-            bufferSize += _exchange.ByteCount; // _exchange in bytes
-            bufferSize += _routingKey.ByteCount; // _routingKey in bytes
+            bufferSize += _queue.Length; // _queue in bytes
+            bufferSize += _exchange.Length; // _exchange in bytes
+            bufferSize += _routingKey.Length; // _routingKey in bytes
             bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes
             return bufferSize;
         }
diff --git a/projects/RabbitMQ.Client/client/impl/ChannelBase.cs b/projects/RabbitMQ.Client/client/impl/ChannelBase.cs
@@ -655,7 +655,7 @@ protected async Task<bool> HandleBasicCancelAsync(IncomingCommand cmd, Cancellat
         {
             try
             {
-                ConsumerTag consumerTag = BasicCancel.GetConsumerTag(cmd.MethodSpan);
+                ConsumerTag consumerTag = new ConsumerTag(cmd.MethodMemory);
                 await ConsumerDispatcher.HandleBasicCancelAsync(consumerTag, cancellationToken)
                     .ConfigureAwait(false);
                 return true;
@@ -673,18 +673,16 @@ protected async Task<bool> HandleBasicDeliverAsync(IncomingCommand cmd, Cancella
                 var method = new BasicDeliver(cmd.MethodMemory);
                 var header = new ReadOnlyBasicProperties(cmd.HeaderSpan);
 
-                // TODO
-                // take advantage of lazy init in AmqpString
-                var ct = new ConsumerTag(method._consumerTag);
-                var ex = new ExchangeName(method._exchange);
-                var rk = new RoutingKey(method._routingKey);
+                var consumerTag = new ConsumerTag(method._consumerTag);
+                var exchangeName = new ExchangeName(method._exchange);
+                var routingKey = new RoutingKey(method._routingKey);
 
                 await ConsumerDispatcher.HandleBasicDeliverAsync(
-                        ct,
+                        consumerTag,
                         AdjustDeliveryTag(method._deliveryTag),
                         method._redelivered,
-                        ex,
-                        rk,
+                        exchangeName,
+                        routingKey,
                         header,
                         cmd.Body,
                         cancellationToken).ConfigureAwait(false);
diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs b/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs
diff --git a/projects/Test/Unit/TestAmqpString.cs b/projects/Test/Unit/TestAmqpString.cs

Original file line number	Diff line number	Diff line change
`@@ -37,38 +37,31 @@ namespace RabbitMQ.Client`
`37`	`37`	`{`
`38`	`38`	`public abstract class AmqpString : IEquatable<AmqpString>, IComparable<AmqpString>`
`39`	`39`	`{`
	`40`	`+ private static readonly Encoding s_encoding = Encoding.UTF8;`
`40`	`41`	`private string _value;`
`41`		`- private readonly Encoding _encoding;`
`42`	`42`	`private readonly ReadOnlyMemory<byte> _stringBytes;`
`43`		`- private readonly int _byteCount;`
`44`	`43`
`45`	`44`	`protected AmqpString()`
`46`	`45`	`{`
`47`	`46`	`_value = string.Empty;`
`48`		`- _encoding = Encoding.UTF8;`
`49`	`47`	`_stringBytes = ReadOnlyMemory<byte>.Empty;`
`50`		`- _byteCount = 0;`
`51`	`48`	`}`
`52`	`49`
`53`	`50`	`public AmqpString(ReadOnlyMemory<byte> stringBytes)`
`54`	`51`	`{`
`55`	`52`	`_value = null;`
`56`		`- _encoding = Encoding.UTF8;`
`57`	`53`	`_stringBytes = stringBytes;`
`58`		`- _byteCount = _stringBytes.Length;`
`59`	`54`	`}`
`60`	`55`
`61`		`- public AmqpString(string value, ushort maxLen, Encoding encoding,`
	`56`	`+ public AmqpString(string value, ushort maxLen,`
`62`	`57`	`bool strictValidation = false)`
`63`		`- : this(value, maxLen, encoding, null, strictValidation)`
	`58`	`+ : this(value, maxLen, null, strictValidation)`
`64`	`59`	`{`
`65`	`60`	`}`
`66`	`61`
`67`		`- public AmqpString(string value, ushort maxLen, Encoding encoding, string validatorRegex,`
	`62`	`+ public AmqpString(string value, ushort maxLen, string validatorRegex,`
`68`	`63`	`bool strictValidation = false)`
`69`	`64`	`{`
`70`		`- _encoding = encoding;`
`71`		`-`
`72`	`65`	`/*`
`73`	`66`	`* Note:`
`74`	`67`	`* RabbitMQ does hardly any validation for names, only stripping off CR/LF`
`@@ -89,22 +82,13 @@ public AmqpString(string value, ushort maxLen, Encoding encoding, string validat`
`89`	`82`	`throw new ArgumentOutOfRangeException(nameof(value));`
`90`	`83`	`}`
`91`	`84`	`}`
`92`		`-`
`93`		`- if (encoding == Encoding.ASCII)`
`94`		`- {`
`95`		`- if (false == isAscii(value))`
`96`		`- {`
`97`		`- throw new ArgumentOutOfRangeException(nameof(value));`
`98`		`- }`
`99`		`- }`
`100`	`85`	`}`
`101`	`86`
`102`	`87`	`_value = FixUp(value);`
`103`		`- _stringBytes = new ReadOnlyMemory<byte>(encoding.GetBytes(value));`
`104`		`- _byteCount = _stringBytes.Length;`
	`88`	`+ _stringBytes = new ReadOnlyMemory<byte>(s_encoding.GetBytes(value));`
`105`	`89`	`}`
`106`	`90`
`107`		`- public int ByteCount => _byteCount;`
	`91`	`+ public int Length => _stringBytes.Length;`
`108`	`92`
`109`	`93`	`internal bool HasString => _value != null;`
`110`	`94`
`@@ -223,19 +207,13 @@ protected virtual string FixUp(string value)`
`223`	`207`	`return value;`
`224`	`208`	`}`
`225`	`209`
`226`		`- // TODO remove`
`227`		`- private static bool isAscii(string value)`
`228`		`- {`
`229`		`- return Encoding.UTF8.GetByteCount(value) == value.Length;`
`230`		`- }`
`231`		`-`
`232`	`210`	`private string Value`
`233`	`211`	`{`
`234`	`212`	`get`
`235`	`213`	`{`
`236`	`214`	`if (_value == null)`
`237`	`215`	`{`
`238`		`- _value = _encoding.GetString(_stringBytes.ToArray());`
	`216`	`+ _value = s_encoding.GetString(_stringBytes.ToArray());`
`239`	`217`	`}`
`240`	`218`	`return _value;`
`241`	`219`	`}`
`@@ -270,7 +248,7 @@ public ExchangeName(string exchangeName)`
`270`	`248`	`}`
`271`	`249`
`272`	`250`	`public ExchangeName(string exchangeName, bool strictValidation)`
`273`		`- : base(exchangeName, 127, Encoding.ASCII, "^[a-zA-Z0-9-_.:]*$", strictValidation)`
	`251`	`+ : base(exchangeName, 127, "^[a-zA-Z0-9-_.:]*$", strictValidation)`
`274`	`252`	`{`
`275`	`253`	`}`
`276`	`254`
`@@ -319,7 +297,7 @@ public QueueName(string queueName)`
`319`	`297`	`}`
`320`	`298`
`321`	`299`	`public QueueName(string queueName, bool strictValidation)`
`322`		`- : base(queueName, 127, Encoding.ASCII, "^[a-zA-Z0-9-_.:]*$", strictValidation)`
	`300`	`+ : base(queueName, 127, "^[a-zA-Z0-9-_.:]*$", strictValidation)`
`323`	`301`	`{`
`324`	`302`	`}`
`325`	`303`
`@@ -367,7 +345,7 @@ public RoutingKey(string routingKey)`
`367`	`345`	`}`
`368`	`346`
`369`	`347`	`public RoutingKey(string routingKey, bool strictValidation)`
`370`		`- : base(routingKey, 256, Encoding.ASCII, strictValidation)`
	`348`	`+ : base(routingKey, 256, strictValidation)`
`371`	`349`	`{`
`372`	`350`	`}`
`373`	`351`
`@@ -403,7 +381,7 @@ public ConsumerTag(string consumerTag)`
`403`	`381`	`}`
`404`	`382`
`405`	`383`	`public ConsumerTag(string consumerTag, bool strictValidation)`
`406`		`- : base(consumerTag, 256, Encoding.UTF8, strictValidation)`
	`384`	`+ : base(consumerTag, 256, strictValidation)`
`407`	`385`	`{`
`408`	`386`	`}`
`409`	`387`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,8 @@ public int WriteTo(Span<byte> span)`
`58`	`58`	`public int GetRequiredBufferSize()`
`59`	`59`	`{`
`60`	`60`	`int bufferSize = 1 + 1; // bytes for length of _consumerTag, bit fields`
`61`		`- bufferSize += _consumerTag.ByteCount; // _consumerTag in bytes`
	`61`	`+ bufferSize += _consumerTag.Length; // _consumerTag in bytes`
`62`	`62`	`return bufferSize;`
`63`	`63`	`}`
`64`		`-`
`65`		`- public static ConsumerTag GetConsumerTag(ReadOnlySpan<byte> span)`
`66`		`- {`
`67`		`- _ = WireFormatting.ReadShortstr(span, out string consumerTagStr);`
`68`		`- return new ConsumerTag(consumerTagStr);`
`69`		`- }`
`70`	`64`	`}`
`71`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ public int WriteTo(Span<byte> span)`
`73`	`73`	`public int GetRequiredBufferSize()`
`74`	`74`	`{`
`75`	`75`	`int bufferSize = 2 + 1 + 1 + 1; // bytes for _reserved1, length of _queue, length of _consumerTag, bit fields`
`76`		`- bufferSize += _queue.ByteCount; // _queue in bytes`
`77`		`- bufferSize += _consumerTag.ByteCount; // _consumerTag in bytes`
	`76`	`+ bufferSize += _queue.Length; // _queue in bytes`
	`77`	`+ bufferSize += _consumerTag.Length; // _consumerTag in bytes`
`78`	`78`	`bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes`
`79`	`79`	`return bufferSize;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public int WriteTo(Span<byte> span)`
`59`	`59`	`public int GetRequiredBufferSize()`
`60`	`60`	`{`
`61`	`61`	`int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _queue, bit fields`
`62`		`- bufferSize += _queue.ByteCount; // _queue in bytes`
	`62`	`+ bufferSize += _queue.Length; // _queue in bytes`
`63`	`63`	`return bufferSize;`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ public int WriteTo(Span<byte> span)`
`70`	`70`	`public int GetRequiredBufferSize()`
`71`	`71`	`{`
`72`	`72`	`int bufferSize = 2 + 1 + 1 + 1 + 1; // bytes for _reserved1, length of _destination, length of _source, length of _routingKey, bit fields`
`73`		`- bufferSize += _destination.ByteCount; // _destination in bytes`
`74`		`- bufferSize += _source.ByteCount; // _source in bytes`
`75`		`- bufferSize += _routingKey.ByteCount; // _routingKey in bytes`
	`73`	`+ bufferSize += _destination.Length; // _destination in bytes`
	`74`	`+ bufferSize += _source.Length; // _source in bytes`
	`75`	`+ bufferSize += _routingKey.Length; // _routingKey in bytes`
`76`	`76`	`bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes`
`77`	`77`	`return bufferSize;`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public int WriteTo(Span<byte> span)`
`76`	`76`	`public int GetRequiredBufferSize()`
`77`	`77`	`{`
`78`	`78`	`int bufferSize = 2 + 1 + 1 + 1; // bytes for _reserved1, length of _exchange, length of _type, bit fields`
`79`		`- bufferSize += _exchange.ByteCount; // _exchange in bytes`
	`79`	`+ bufferSize += _exchange.Length; // _exchange in bytes`
`80`	`80`	`bufferSize += _type.ByteCount; // _type in bytes`
`81`	`81`	`bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes`
`82`	`82`	`return bufferSize;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public int WriteTo(Span<byte> span)`
`61`	`61`	`public int GetRequiredBufferSize()`
`62`	`62`	`{`
`63`	`63`	`int bufferSize = 2 + 1 + 1; // bytes for _reserved1, length of _exchange, bit fields`
`64`		`- bufferSize += _exchange.ByteCount; // _exchange in bytes`
	`64`	`+ bufferSize += _exchange.Length; // _exchange in bytes`
`65`	`65`	`return bufferSize;`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public int WriteTo(Span<byte> span)`
`70`	`70`	`public int GetRequiredBufferSize()`
`71`	`71`	`{`
`72`	`72`	`int bufferSize = 2 + 1 + 1 + 1 + 1; // bytes for _reserved1, length of _queue, length of _exchange, length of _routingKey, bit fields`
`73`		`- bufferSize += _queue.ByteCount; // _queue in bytes`
	`73`	`+ bufferSize += _queue.Length; // _queue in bytes`
`74`	`74`	`bufferSize += WireFormatting.GetByteCount(_exchange); // _exchange in bytes`
`75`	`75`	`bufferSize += WireFormatting.GetByteCount(_routingKey); // _routingKey in bytes`
`76`	`76`	`bufferSize += WireFormatting.GetTableByteCount(_arguments); // _arguments in bytes`