[rocketmq] branch develop updated: [ISSUE# 6650]: Fix using the deprecated method `MessgaeStore#checkInDiskByConsumeOffset` (#6651)

[yukon]

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

yukon 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 dcf7ccdd9 [ISSUE# 6650]: Fix using the deprecated method 
`MessgaeStore#checkInDiskByConsumeOffset` (#6651)
dcf7ccdd9 is described below

commit dcf7ccdd9ba92c22a44cde4c1df36c4d1ef6a172
Author: TheR1sing3un <87409330+ther1sing...@users.noreply.github.com>
AuthorDate: Thu Apr 27 17:16:39 2023 +0800

    [ISSUE# 6650]: Fix using the deprecated method 
`MessgaeStore#checkInDiskByConsumeOffset` (#6651)
    
    * fix(tieredstorage): fix using deprecated method 
`MessageStore#checkInDiskByConsumeOffset`
    
    1. fix using deprecated method `MessageStore#checkInDiskByConsumeOffset`
    
    * test(tieredstorage): replace `checkInDiskeByConsumeOffset` with 
`checkInStoreByConsumeOffset`
    
    1. replace `checkInDiskeByConsumeOffset` with `checkInStoreByConsumeOffset`
---
 .../main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java   | 2 +-
 .../java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java
 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java
index 78b6ae3bc..5afa916d5 100644
--- 
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java
+++ 
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java
@@ -153,7 +153,7 @@ public class TieredMessageStore extends 
AbstractPluginMessageStore {
                     if (result.getStatus() == 
GetMessageStatus.OFFSET_FOUND_NULL ||
                         result.getStatus() == 
GetMessageStatus.OFFSET_OVERFLOW_ONE ||
                         result.getStatus() == 
GetMessageStatus.OFFSET_OVERFLOW_BADLY) {
-                        if (next.checkInDiskByConsumeOffset(topic, queueId, 
offset)) {
+                        if (next.checkInStoreByConsumeOffset(topic, queueId, 
offset)) {
                             logger.debug("TieredMessageStore#getMessageAsync: 
not found message, try to get message from next store: topic: {}, queue: {}, 
queue offset: {}, tiered store result: {}, min offset: {}, max offset: {}",
                                 topic, queueId, offset, result.getStatus(), 
result.getMinOffset(), result.getMaxOffset());
                             TieredStoreMetricsManager.fallbackTotal.add(1, 
latencyAttributes);
diff --git 
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java
 
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java
index c5f5ef990..c37ce2c85 100644
--- 
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java
+++ 
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java
@@ -189,7 +189,7 @@ public class TieredMessageStoreTest {
         Properties properties = new Properties();
         properties.setProperty("tieredStorageLevel", "3");
         configuration.update(properties);
-        when(nextStore.checkInDiskByConsumeOffset(anyString(), anyInt(), 
anyLong())).thenReturn(true);
+        when(nextStore.checkInStoreByConsumeOffset(anyString(), anyInt(), 
anyLong())).thenReturn(true);
         Assert.assertSame(result2, store.getMessage("group", mq.getTopic(), 
mq.getQueueId(), 0, 0, null));
     }