(rocketmq) branch develop updated: [ISSUE #7585] Always return duplicate buffer when filter message and fix log format (#7654)

[lizhimin]

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

lizhimin 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 50a92a2474 [ISSUE #7585] Always return duplicate buffer when filter 
message and fix log format (#7654)
50a92a2474 is described below

commit 50a92a2474e4c29dcf2753d8d68332011af71265
Author: lizhimins <707364...@qq.com>
AuthorDate: Wed Dec 13 19:50:19 2023 +0800

    [ISSUE #7585] Always return duplicate buffer when filter message and fix 
log format (#7654)
---
 .../org/apache/rocketmq/tieredstore/common/GetMessageResultExt.java  | 5 ++---
 .../org/apache/rocketmq/tieredstore/provider/TieredFileSegment.java  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/GetMessageResultExt.java
 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/GetMessageResultExt.java
index 52462b5dc5..2e294c1c7d 100644
--- 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/GetMessageResultExt.java
+++ 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/GetMessageResultExt.java
@@ -23,7 +23,6 @@ import org.apache.rocketmq.store.GetMessageResult;
 import org.apache.rocketmq.store.GetMessageStatus;
 import org.apache.rocketmq.store.MessageFilter;
 import org.apache.rocketmq.store.SelectMappedBufferResult;
-import org.apache.rocketmq.tieredstore.util.MessageBufferUtil;
 
 public class GetMessageResultExt extends GetMessageResult {
 
@@ -63,9 +62,9 @@ public class GetMessageResultExt extends GetMessageResult {
                 continue;
             }
 
+            long offset = this.getMessageQueueOffset().get(i);
             result.addMessage(new 
SelectMappedBufferResult(bufferResult.getStartOffset(),
-                    bufferResult.getByteBuffer(), bufferResult.getSize(), 
null),
-                
MessageBufferUtil.getQueueOffset(bufferResult.getByteBuffer()));
+                bufferResult.getByteBuffer().asReadOnlyBuffer(), 
bufferResult.getSize(), null), offset);
         }
 
         if (result.getBufferTotalSize() == 0) {
diff --git 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/TieredFileSegment.java
 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/TieredFileSegment.java
index 5e3d8c5624..6703de9403 100644
--- 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/TieredFileSegment.java
+++ 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/TieredFileSegment.java
@@ -367,7 +367,7 @@ public abstract class TieredFileSegment implements 
Comparable<TieredFileSegment>
             if (fileSegmentInputStream != null) {
                 long fileSize = this.getSize();
                 if (fileSize == -1L) {
-                    logger.error("Get commit position error before commit, 
Commit: %d, Expect: %d, Current Max: %d, FileName: %s",
+                    logger.error("Get commit position error before commit, 
Commit: {}, Expect: {}, Current Max: {}, FileName: {}",
                         commitPosition, commitPosition + 
fileSegmentInputStream.getContentLength(), appendPosition, getPath());
                     releaseCommitLock();
                     return CompletableFuture.completedFuture(false);