Disable batch send for dlq producer. (#403)

shibd · web-flow · commit 7891ac569eec · 2024-02-19T10:18:11.000+08:00
diff --git a/lib/ConsumerImpl.cc b/lib/ConsumerImpl.cc
@@ -1736,6 +1736,7 @@ void ConsumerImpl::processPossibleToDLQ(const MessageId& messageId, ProcessDLQCa
             ProducerConfiguration producerConfiguration;
             producerConfiguration.setSchema(config_.getSchema());
             producerConfiguration.setBlockIfQueueFull(false);
+            producerConfiguration.setBatchingEnabled(false);
             producerConfiguration.impl_->initialSubscriptionName =
                 deadLetterPolicy_.getInitialSubscriptionName();
             ClientImplPtr client = client_.lock();
diff --git a/tests/DeadLetterQueueTest.cc b/tests/DeadLetterQueueTest.cc
@@ -270,6 +270,8 @@ TEST_P(DeadLetterQueueTest, testSendDLQTriggerByRedeliverUnacknowledgedMessages)
         ASSERT_EQ(msg.getPartitionKey(), "p-key");
         ASSERT_EQ(msg.getOrderingKey(), "o-key");
         ASSERT_EQ(msg.getProperty("pk-1"), "pv-1");
+        ASSERT_EQ(msg.getMessageId().batchSize(), 0);
+        ASSERT_EQ(msg.getMessageId().batchIndex(), -1);
         ASSERT_TRUE(msg.getProperty(SYSTEM_PROPERTY_REAL_TOPIC).find(topic_));
         ASSERT_FALSE(msg.getProperty(PROPERTY_ORIGIN_MESSAGE_ID).empty());
     }

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,8 @@ TEST_P(DeadLetterQueueTest, testSendDLQTriggerByRedeliverUnacknowledgedMessages)`
`270`	`270`	`ASSERT_EQ(msg.getPartitionKey(), "p-key");`
`271`	`271`	`ASSERT_EQ(msg.getOrderingKey(), "o-key");`
`272`	`272`	`ASSERT_EQ(msg.getProperty("pk-1"), "pv-1");`
	`273`	`+ ASSERT_EQ(msg.getMessageId().batchSize(), 0);`
	`274`	`+ ASSERT_EQ(msg.getMessageId().batchIndex(), -1);`
`273`	`275`	`ASSERT_TRUE(msg.getProperty(SYSTEM_PROPERTY_REAL_TOPIC).find(topic_));`
`274`	`276`	`ASSERT_FALSE(msg.getProperty(PROPERTY_ORIGIN_MESSAGE_ID).empty());`
`275`	`277`	`}`