[ISSUE apache#7585] Always return duplicate buffer when filter messag…

…e and fix log format (apache#7654)
sunxiaojian · Dec 13, 2023 · 50a92a2 · 50a92a2
1 parent a376fbc
commit 50a92a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -23,7 +23,6 @@
 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 GetMessageResult doFilterMessage(MessageFilter messageFilter) {
                 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
@@ -367,7 +367,7 @@ public CompletableFuture<Boolean> commitAsync() {
             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);