Remove ClientArrayPool

Fixes #1421
rabbitmq · Mar 11, 2024 · f9dd5c6 · f9dd5c6
1 parent 0682db6
commit f9dd5c6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 123 deletions.
diff --git a/projects/RabbitMQ.Client/client/ClientArrayPool.cs b/projects/RabbitMQ.Client/client/ClientArrayPool.cs
diff --git a/projects/RabbitMQ.Client/client/RentedMemory.cs b/projects/RabbitMQ.Client/client/RentedMemory.cs
@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using System.Buffers;
 
 namespace RabbitMQ.Client
 {
@@ -73,7 +74,7 @@ private void Dispose(bool disposing)
             {
                 if (disposing && RentedArray != null)
                 {
-                    ClientArrayPool.Return(RentedArray);
+                    ArrayPool<byte>.Shared.Return(RentedArray);
                 }
 
                 _disposedValue = true;

diff --git a/projects/RabbitMQ.Client/client/impl/CommandAssembler.cs b/projects/RabbitMQ.Client/client/impl/CommandAssembler.cs
@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using System.Buffers;
 using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Client.Framing.Impl;
@@ -185,7 +186,7 @@ private bool ParseBodyFrame(in InboundFrame frame)
                 }
 
                 // Is returned by IncomingCommand.ReturnPayload in Session.HandleFrame
-                _rentedBodyArray = ClientArrayPool.Rent(_remainingBodyByteCount);
+                _rentedBodyArray = ArrayPool<byte>.Shared.Rent(_remainingBodyByteCount);
                 _bodyMemory = new ReadOnlyMemory<byte>(_rentedBodyArray, 0, _remainingBodyByteCount);
             }
 

diff --git a/projects/RabbitMQ.Client/client/impl/Frame.cs b/projects/RabbitMQ.Client/client/impl/Frame.cs
@@ -143,7 +143,7 @@ internal static class Heartbeat
             public static RentedMemory GetHeartbeatFrame()
             {
                 // Is returned by SocketFrameHandler.WriteLoop
-                byte[] buffer = ClientArrayPool.Rent(FrameSize);
+                byte[] buffer = ArrayPool<byte>.Shared.Rent(FrameSize);
                 Payload.CopyTo(buffer);
                 var mem = new ReadOnlyMemory<byte>(buffer, 0, FrameSize);
                 return new RentedMemory(mem, buffer);
@@ -157,7 +157,7 @@ public static RentedMemory SerializeToFrames<T>(ref T method, ushort channelNumb
             int size = Method.FrameSize + method.GetRequiredBufferSize();
 
             // Will be returned by SocketFrameWriter.WriteLoop
-            byte[] array = ClientArrayPool.Rent(size);
+            byte[] array = ArrayPool<byte>.Shared.Rent(size);
             int offset = Method.WriteTo(array, channelNumber, ref method);
 
             System.Diagnostics.Debug.Assert(offset == size, $"Serialized to wrong size, expect {size}, offset {offset}");
@@ -176,7 +176,7 @@ public static RentedMemory SerializeToFrames<T>(ref T method, ushort channelNumb
                        BodySegment.FrameSize * GetBodyFrameCount(maxBodyPayloadBytes, remainingBodyBytes) + remainingBodyBytes;
 
             // Will be returned by SocketFrameWriter.WriteLoop
-            byte[] array = ClientArrayPool.Rent(size);
+            byte[] array = ArrayPool<byte>.Shared.Rent(size);
 
             int offset = Method.WriteTo(array, channelNumber, ref method);
             offset += Header.WriteTo(array.AsSpan(offset), channelNumber, ref header, remainingBodyBytes);
@@ -342,14 +342,14 @@ internal static bool TryReadFrame(ref ReadOnlySequence<byte> buffer, uint maxMes
             }
             else
             {
-                byte[] payloadBytes = ClientArrayPool.Rent(readSize);
+                byte[] payloadBytes = ArrayPool<byte>.Shared.Rent(readSize);
                 ReadOnlySequence<byte> framePayload = buffer.Slice(7, readSize);
                 framePayload.CopyTo(payloadBytes);
 
                 if (payloadBytes[payloadSize] != Constants.FrameEnd)
                 {
                     byte frameEndMarker = payloadBytes[payloadSize];
-                    ClientArrayPool.Return(payloadBytes);
+                    ArrayPool<byte>.Shared.Return(payloadBytes);
                     throw new MalformedFrameException($"Bad frame end marker: {frameEndMarker}");
                 }
 
@@ -368,7 +368,7 @@ public byte[] TakeoverPayload()
 
         public void ReturnPayload()
         {
-            ClientArrayPool.Return(_rentedArray);
+            ArrayPool<byte>.Shared.Return(_rentedArray);
         }
 
         public override string ToString()

diff --git a/projects/Test/Unit/TestFrameFormatting.cs b/projects/Test/Unit/TestFrameFormatting.cs
@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using System.Buffers;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Framing.Impl;
 using RabbitMQ.Client.Impl;
@@ -59,7 +60,7 @@ public void HeartbeatFrame()
             }
             finally
             {
-                ClientArrayPool.Return(sfc.RentedArray);
+                ArrayPool<byte>.Shared.Return(sfc.RentedArray);
             }
         }