Merge branch 'framingbenchmarksandoptimizations' of https://github.co…

…m/stebet/rabbitmq-dotnet-client into framingbenchmarksandoptimizations
rabbitmq · Feb 12, 2021 · e08aa7f · e08aa7f
2 parents 261bc2e + 636715c
commit e08aa7f
Show file tree

Hide file tree

Showing 37 changed files with 331 additions and 1,402 deletions.
diff --git a/projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs b/projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs
@@ -51,7 +51,7 @@ namespace RabbitMQ.Client
     /// timestamps are signed or unsigned.
     /// </para>
     /// </remarks>
-    public struct AmqpTimestamp : IEquatable<AmqpTimestamp>
+    public readonly struct AmqpTimestamp : IEquatable<AmqpTimestamp>
     {
         /// <summary>
         /// Construct an <see cref="AmqpTimestamp"/>.

diff --git a/projects/RabbitMQ.Client/client/api/IConnection.cs b/projects/RabbitMQ.Client/client/api/IConnection.cs
@@ -107,13 +107,6 @@ public interface IConnection : INetworkConnection, IDisposable
         /// </summary>
         bool IsOpen { get; }
 
-        /// <summary>
-        /// Returns the known hosts that came back from the
-        /// broker in the connection.open-ok method at connection
-        /// startup time. Null until the connection is completely open and ready for use.
-        /// </summary>
-        AmqpTcpEndpoint[] KnownHosts { get; }
-
         /// <summary>
         /// The <see cref="IProtocol"/> this connection is using to communicate with its peer.
         /// </summary>
@@ -224,15 +217,5 @@ public interface IConnection : INetworkConnection, IDisposable
         /// Create and return a fresh channel, session, and model.
         /// </summary>
         IModel CreateModel();
-
-        /// <summary>
-        /// Handle incoming Connection.Blocked methods.
-        /// </summary>
-        void HandleConnectionBlocked(string reason);
-
-        /// <summary>
-        /// Handle incoming Connection.Unblocked methods.
-        /// </summary>
-        void HandleConnectionUnblocked();
     }
 }
diff --git a/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs b/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary>Thrown when the application tries to make use of a
     /// session or connection that has already been shut
     /// down.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class AlreadyClosedException : OperationInterruptedException
     {
         ///<summary>Construct an instance containing the given

diff --git a/projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the cause is  an
     /// authentication failure. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class AuthenticationFailureException : PossibleAuthenticationFailureException
     {
         public AuthenticationFailureException(string msg) : base(msg)

diff --git a/projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs b/projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     ///<summary>Thrown when no connection could be opened during a
     ///ConnectionFactory.CreateConnection attempt.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class BrokerUnreachableException : IOException
     {
         ///<summary>Construct a BrokerUnreachableException. The inner exception is

diff --git a/projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs b/projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary> Thrown when a SessionManager cannot allocate a new
     /// channel number, or the requested channel number is already in
     /// use. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ChannelAllocationException : ProtocolViolationException
     {
         /// <summary>

diff --git a/projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs
@@ -34,9 +34,7 @@
 namespace RabbitMQ.Client.Exceptions
 {
     /// <summary>Thrown when a connection to the broker fails</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ConnectFailureException : ProtocolViolationException
     {
         public ConnectFailureException(string msg, Exception inner)

diff --git a/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs b/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs
@@ -40,9 +40,7 @@ namespace RabbitMQ.Client.Exceptions
     /// operation, an OperationInterruptedException will be thrown to
     /// the caller of IModel.QueueDeclare.
     /// </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class OperationInterruptedException
         // TODO: inherit from OperationCanceledException
         : RabbitMQClientException

diff --git a/projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs b/projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs
@@ -41,9 +41,7 @@ namespace RabbitMQ.Client.Exceptions
     ///The peer's {'A','M','Q','P',txHi,txLo,major,minor} packet is
     ///decoded into instances of this class.
     ///</remarks>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class PacketNotRecognizedException : RabbitMQClientException
     {
         ///<summary>Fills the new instance's properties with the values passed in.</summary>

diff --git a/projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the likely cause is  an
     /// authentication failure. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class PossibleAuthenticationFailureException : RabbitMQClientException
     {
         public PossibleAuthenticationFailureException(string msg, Exception inner) : base(msg, inner)

diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs b/projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     ///<summary>Thrown to indicate that the peer does not support the
     ///wire protocol version we requested immediately after opening
     ///the TCP socket.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ProtocolVersionMismatchException : ProtocolViolationException
     {
         ///<summary>Fills the new instance's properties with the values passed in.</summary>

diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs b/projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs
@@ -33,9 +33,7 @@
 
 namespace RabbitMQ.Client.Exceptions
 {
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ProtocolViolationException : RabbitMQClientException
     {
         public ProtocolViolationException(string message) : base(message)

diff --git a/projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs b/projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs
@@ -33,9 +33,7 @@
 
 namespace RabbitMQ.Client.Exceptions
 {
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public abstract class RabbitMQClientException : Exception
     {
         /// <summary>Initializes a new instance of the <see cref="RabbitMQClientException" /> class.</summary>

diff --git a/projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs b/projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the wire-formatting code cannot encode a
     /// particular .NET value to AMQP protocol format.  </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class WireFormattingException : ProtocolViolationException
     {
         ///<summary>Construct a WireFormattingException with no

diff --git a/projects/RabbitMQ.Client/client/framing/Model.cs b/projects/RabbitMQ.Client/client/framing/Model.cs
@@ -116,11 +116,6 @@ public override void _Private_ConfirmSelect(bool nowait)
             }
         }
 
-        public override void _Private_ConnectionClose(ushort replyCode, string replyText, ushort classId, ushort methodId)
-        {
-            ModelRpc<ConnectionCloseOk>(new ConnectionClose(replyCode, replyText, classId, methodId));
-        }
-
         public override void _Private_ConnectionCloseOk()
         {
             ModelSend(new ConnectionCloseOk());
@@ -298,7 +293,7 @@ public override void TxSelect()
             ModelRpc<TxSelectOk>(new TxSelect());
         }
 
-        public override bool DispatchAsynchronous(in IncomingCommand cmd)
+        protected override bool DispatchAsynchronous(in IncomingCommand cmd)
         {
             switch (cmd.Method.ProtocolCommandId)
             {

diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs
@@ -73,7 +73,7 @@ internal void DeleteRecordedExchange(string exchangeName)
             }
         }
 
-        public void DeleteAutoDeleteExchange(string exchangeName)
+        internal void DeleteAutoDeleteExchange(string exchangeName)
         {
             lock (_recordedEntitiesLock)
             {

diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs
@@ -159,10 +159,10 @@ private bool TryRecoverConnectionDelegate()
         {
             try
             {
-                var defunctConnection = _delegate;
+                var defunctConnection = _innerConnection;
                 IFrameHandler fh = _endpoints.SelectOne(_factory.CreateFrameHandler);
-                _delegate = new Connection(_factory, fh, ClientProvidedName);
-                _delegate.TakeOver(defunctConnection);
+                _innerConnection = new Connection(_factory, fh, ClientProvidedName);
+                _innerConnection.TakeOver(defunctConnection);
                 return true;
             }
             catch (Exception e)