Merge branch 'bollhals-batchpublishsizehint'

(cherry picked from commit 805dfb5)

Author: michaelklishin

projects/RabbitMQ.Client/client/api/IModel.cs

@@ -291,6 +291,12 @@ void BasicPublish(string exchange, string routingKey, bool mandatory,
         [AmqpMethodDoNotImplement(null)]
         IBasicPublishBatch CreateBasicPublishBatch();
 
+        /// <summary>
+        ///  Creates a BasicPublishBatch instance
+        /// </summary>
+        [AmqpMethodDoNotImplement(null)]
+        IBasicPublishBatch CreateBasicPublishBatch(int sizeHint);
+
         /// <summary>
         /// Construct a completely empty content header for use with the Basic content class.
         /// </summary>

projects/RabbitMQ.Client/client/impl/AutorecoveringModel.cs

@@ -1960,5 +1960,15 @@ public IBasicPublishBatch CreateBasicPublishBatch()
 
             return ((IFullModel)_delegate).CreateBasicPublishBatch();
         }
+
+        public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(GetType().FullName);
+            }
+
+            return ((IFullModel)_delegate).CreateBasicPublishBatch(sizeHint);
+        }
     }
 }

projects/RabbitMQ.Client/client/impl/BasicPublishBatch.cs

@@ -38,21 +38,27 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-using System;
-using System.Buffers;
 using System.Collections.Generic;
 
 using RabbitMQ.Client.Framing.Impl;
 
 namespace RabbitMQ.Client.Impl
 {
-    class BasicPublishBatch : IBasicPublishBatch
+    internal sealed class BasicPublishBatch : IBasicPublishBatch
     {
-        private readonly List<Command> _commands = new List<Command>();
+        private readonly List<Command> _commands;
         private readonly ModelBase _model;
+
         internal BasicPublishBatch (ModelBase model)
         {
             _model = model;
+            _commands = new List<Command>();
+        }
+
+        internal BasicPublishBatch (ModelBase model, int sizeHint)
+        {
+            _model = model;
+            _commands = new List<Command>(sizeHint);
         }
 
         public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)

projects/RabbitMQ.Client/client/impl/ModelBase.cs

@@ -1203,6 +1203,11 @@ public IBasicPublishBatch CreateBasicPublishBatch()
             return new BasicPublishBatch(this);
         }
 
+        public IBasicPublishBatch CreateBasicPublishBatch(int sizeHint)
+        {
+            return new BasicPublishBatch(this, sizeHint);
+        }
+
 
         public void ExchangeBind(string destination,
             string source,

projects/Unit/APIApproval.Approve.verified.txt

@@ -398,6 +398,7 @@ namespace RabbitMQ.Client
         uint ConsumerCount(string queue);
         RabbitMQ.Client.IBasicProperties CreateBasicProperties();
         RabbitMQ.Client.IBasicPublishBatch CreateBasicPublishBatch();
+        RabbitMQ.Client.IBasicPublishBatch CreateBasicPublishBatch(int sizeHint);
         void ExchangeBind(string destination, string source, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments);
         void ExchangeBindNoWait(string destination, string source, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments);
         void ExchangeDeclare(string exchange, string type, bool durable, bool autoDelete, System.Collections.Generic.IDictionary<string, object> arguments);

projects/Unit/TestBasicPublishBatch.cs

@@ -62,5 +62,39 @@ public void TestBasicPublishBatchSend()
             BasicGetResult resultB = Model.BasicGet("test-message-batch-b", true);
             Assert.NotNull(resultB);
         }
+
+        [Test]
+        public void TestBasicPublishBatchSendWithSizeHint()
+        {
+            Model.ConfirmSelect();
+            Model.QueueDeclare(queue: "test-message-batch-a", durable: false);
+            Model.QueueDeclare(queue: "test-message-batch-b", durable: false);
+            IBasicPublishBatch batch = Model.CreateBasicPublishBatch(2);
+            batch.Add("", "test-message-batch-a", false, null, new byte [] {});
+            batch.Add("", "test-message-batch-b", false, null, new byte [] {});
+            batch.Publish();
+            Model.WaitForConfirmsOrDie(TimeSpan.FromSeconds(15));
+            BasicGetResult resultA = Model.BasicGet("test-message-batch-a", true);
+            Assert.NotNull(resultA);
+            BasicGetResult resultB = Model.BasicGet("test-message-batch-b", true);
+            Assert.NotNull(resultB);
+        }
+
+        [Test]
+        public void TestBasicPublishBatchSendWithWrongSizeHint()
+        {
+            Model.ConfirmSelect();
+            Model.QueueDeclare(queue: "test-message-batch-a", durable: false);
+            Model.QueueDeclare(queue: "test-message-batch-b", durable: false);
+            IBasicPublishBatch batch = Model.CreateBasicPublishBatch(1);
+            batch.Add("", "test-message-batch-a", false, null, new byte [] {});
+            batch.Add("", "test-message-batch-b", false, null, new byte [] {});
+            batch.Publish();
+            Model.WaitForConfirmsOrDie(TimeSpan.FromSeconds(15));
+            BasicGetResult resultA = Model.BasicGet("test-message-batch-a", true);
+            Assert.NotNull(resultA);
+            BasicGetResult resultB = Model.BasicGet("test-message-batch-b", true);
+            Assert.NotNull(resultB);
+        }
     }
 }