[rocketmq] branch develop updated: [ISSUE 3019] Fixed bug with batch-sent message statistics

[zhoubo]

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

zhoubo 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 2b236c3  [ISSUE 3019] Fixed bug with batch-sent message statistics
2b236c3 is described below

commit 2b236c3cd8ce2883c0188c759ccaa644fea8e00c
Author: Git_Yang <30995057+git-y...@users.noreply.github.com>
AuthorDate: Mon Jun 21 20:35:32 2021 +0800

    [ISSUE 3019] Fixed bug with batch-sent message statistics
    
    Signed-off-by: zhangyang <git_y...@163.com>
---
 .../java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
index 9241ffe..90fd6f3 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
@@ -553,7 +553,7 @@ public class DLedgerCommitLog extends CommitLog {
         msgIdBuilder.setLength(0);
         long elapsedTimeInLock;
         long queueOffset;
-        long msgNum = 0;
+        int msgNum = 0;
         try {
             beginTimeInDledgerLock = 
this.defaultMessageStore.getSystemClock().now();
             queueOffset = getQueueOffsetByKey(encodeResult.queueOffsetKey, 
tranType);
@@ -592,6 +592,7 @@ public class DLedgerCommitLog extends CommitLog {
             elapsedTimeInLock = 
this.defaultMessageStore.getSystemClock().now() - beginTimeInDledgerLock;
             appendResult = new AppendMessageResult(AppendMessageStatus.PUT_OK, 
firstWroteOffset, encodeResult.totalMsgLen,
                     msgIdBuilder.toString(), System.currentTimeMillis(), 
queueOffset, elapsedTimeInLock);
+            appendResult.setMsgNum(msgNum);
             
DLedgerCommitLog.this.topicQueueTable.put(encodeResult.queueOffsetKey, 
queueOffset + msgNum);
         } catch (Exception e) {
             log.error("Put message error", e);
@@ -779,7 +780,7 @@ public class DLedgerCommitLog extends CommitLog {
         msgIdBuilder.setLength(0);
         long elapsedTimeInLock;
         long queueOffset;
-        long msgNum = 0;
+        int msgNum = 0;
         try {
             beginTimeInDledgerLock = 
this.defaultMessageStore.getSystemClock().now();
             queueOffset = getQueueOffsetByKey(encodeResult.queueOffsetKey, 
tranType);
@@ -818,6 +819,7 @@ public class DLedgerCommitLog extends CommitLog {
             elapsedTimeInLock = 
this.defaultMessageStore.getSystemClock().now() - beginTimeInDledgerLock;
             appendResult = new AppendMessageResult(AppendMessageStatus.PUT_OK, 
firstWroteOffset, encodeResult.totalMsgLen,
                     msgIdBuilder.toString(), System.currentTimeMillis(), 
queueOffset, elapsedTimeInLock);
+            appendResult.setMsgNum(msgNum);
             
DLedgerCommitLog.this.topicQueueTable.put(encodeResult.queueOffsetKey, 
queueOffset + msgNum);
         } catch (Exception e) {
             log.error("Put message error", e);