[rocketmq] branch develop updated: [ISSUE #5830] fix bug in GetMessageResult#getMessageCount (#5831)

[lollipop]

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

lollipop 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 268e9b901 [ISSUE  #5830] fix bug in GetMessageResult#getMessageCount 
(#5831)
268e9b901 is described below

commit 268e9b901892f49b743fe177e56669cf2d3f8c36
Author: SSpirits <ad...@lv5.moe>
AuthorDate: Fri Jan 6 10:44:47 2023 +0800

    [ISSUE  #5830] fix bug in GetMessageResult#getMessageCount (#5831)
    
    * fix bug in GetMessageResult#getMessageCount
    
    * add license
    
    * fix codestyle
---
 .../apache/rocketmq/store/GetMessageResult.java    |  4 +-
 .../rocketmq/store/GetMessageResultTest.java       | 43 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git 
a/store/src/main/java/org/apache/rocketmq/store/GetMessageResult.java 
b/store/src/main/java/org/apache/rocketmq/store/GetMessageResult.java
index 812395c2f..724ffdd87 100644
--- a/store/src/main/java/org/apache/rocketmq/store/GetMessageResult.java
+++ b/store/src/main/java/org/apache/rocketmq/store/GetMessageResult.java
@@ -114,6 +114,7 @@ public class GetMessageResult {
         this.bufferTotalSize += mapedBuffer.getSize();
         this.msgCount4Commercial += (int) Math.ceil(
             mapedBuffer.getSize() /  (double)commercialSizePerMsg);
+        this.messageCount++;
     }
 
     public void addMessage(final SelectMappedBufferResult mapedBuffer, final 
long queueOffset) {
@@ -122,13 +123,14 @@ public class GetMessageResult {
         this.bufferTotalSize += mapedBuffer.getSize();
         this.msgCount4Commercial += (int) Math.ceil(
             mapedBuffer.getSize() /  (double)commercialSizePerMsg);
+        this.messageCount++;
         this.messageQueueOffset.add(queueOffset);
     }
 
 
     public void addMessage(final SelectMappedBufferResult mapedBuffer, final 
long queueOffset, final int batchNum) {
         addMessage(mapedBuffer, queueOffset);
-        messageCount += batchNum;
+        messageCount += batchNum - 1;
     }
 
     public void release() {
diff --git 
a/store/src/test/java/org/apache/rocketmq/store/GetMessageResultTest.java 
b/store/src/test/java/org/apache/rocketmq/store/GetMessageResultTest.java
new file mode 100644
index 000000000..98129c26d
--- /dev/null
+++ b/store/src/test/java/org/apache/rocketmq/store/GetMessageResultTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rocketmq.store;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class GetMessageResultTest {
+
+    @Test
+    public void testAddMessage() {
+        GetMessageResult getMessageResult = new GetMessageResult();
+        SelectMappedBufferResult mappedBufferResult1 = new 
SelectMappedBufferResult(0, null, 4 * 1024, null);
+        getMessageResult.addMessage(mappedBufferResult1);
+
+        SelectMappedBufferResult mappedBufferResult2 = new 
SelectMappedBufferResult(0, null, 2 * 4 * 1024, null);
+        getMessageResult.addMessage(mappedBufferResult2, 0);
+
+        SelectMappedBufferResult mappedBufferResult3 = new 
SelectMappedBufferResult(0, null, 4 * 4 * 1024, null);
+        getMessageResult.addMessage(mappedBufferResult3, 0, 2);
+
+        Assert.assertEquals(getMessageResult.getMessageQueueOffset().size(), 
2);
+        Assert.assertEquals(getMessageResult.getMessageBufferList().size(), 3);
+        Assert.assertEquals(getMessageResult.getMessageMapedList().size(), 3);
+        Assert.assertEquals(getMessageResult.getMessageCount(), 4);
+        Assert.assertEquals(getMessageResult.getMsgCount4Commercial(), 1 + 2 + 
4);
+        Assert.assertEquals(getMessageResult.getBufferTotalSize(), (1 + 2 + 4) 
* 4 * 1024);
+    }
+}