[rocketmq] branch develop updated: [ISSUE #7453] Fix the problem in constructing the GetMessageResult (#7456)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2113fa371b [ISSUE #7453] Fix the problem in constructing the 
GetMessageResult (#7456)
2113fa371b is described below

commit 2113fa371b9c2bf7c512f8ad234e51c616f1362c
Author: guyinyou <36399867+guyin...@users.noreply.github.com>
AuthorDate: Fri Oct 13 13:47:09 2023 +0800

    [ISSUE #7453] Fix the problem in constructing the GetMessageResult (#7456)
    
    * Fix the problem in constructing the GetMessageResult
    
    * Optimize the initialization size of GetMessageResult
---
 .../org/apache/rocketmq/broker/processor/PeekMessageProcessor.java     | 3 +--
 .../java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PeekMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PeekMessageProcessor.java
index a8358c4ffb..e1e0e13e53 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PeekMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PeekMessageProcessor.java
@@ -129,8 +129,7 @@ public class PeekMessageProcessor implements 
NettyRequestProcessor {
         }
         int randomQ = random.nextInt(100);
         int reviveQid = randomQ % 
this.brokerController.getBrokerConfig().getReviveQueueNum();
-        int commercialSizePerMsg = 
this.brokerController.getBrokerConfig().getCommercialSizePerMsg();
-        GetMessageResult getMessageResult = new 
GetMessageResult(commercialSizePerMsg);
+        GetMessageResult getMessageResult = new 
GetMessageResult(requestHeader.getMaxMsgNums());
         boolean needRetry = randomQ % 5 == 0;
         long popTime = System.currentTimeMillis();
         long restNum = 0;
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
index 441f7de08a..0d9bdf1439 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
@@ -347,8 +347,7 @@ public class PopMessageProcessor implements 
NettyRequestProcessor {
             reviveQid = (int) Math.abs(ckMessageNumber.getAndIncrement() % 
this.brokerController.getBrokerConfig().getReviveQueueNum());
         }
 
-        int commercialSizePerMsg = 
this.brokerController.getBrokerConfig().getCommercialSizePerMsg();
-        GetMessageResult getMessageResult = new 
GetMessageResult(commercialSizePerMsg);
+        GetMessageResult getMessageResult = new 
GetMessageResult(requestHeader.getMaxMsgNums());
         ExpressionMessageFilter finalMessageFilter = messageFilter;
         StringBuilder finalOrderCountInfo = orderCountInfo;