[rocketmq] branch develop updated: [ISSUE #6525]Make ConsumeQueueInterface extends from FileQueueLifeCycle (#6534)

[karp]

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

karp 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 d1b14b0ff9 [ISSUE #6525]Make ConsumeQueueInterface extends from 
FileQueueLifeCycle (#6534)
d1b14b0ff9 is described below

commit d1b14b0ff9f1cef1780981eecf81826ed00257c5
Author: Abhijeet Mishra <abhijeetmishra...@gmail.com>
AuthorDate: Sat Apr 15 15:51:03 2023 +0530

    [ISSUE #6525]Make ConsumeQueueInterface extends from FileQueueLifeCycle 
(#6534)
    
    * [#6525] Make ConsumeQueueInterface extends from FileQueueLifeCycle
    
    * [apache#6525] forced typecast is removed
    
    * [#6525] remove all the forced convert
---
 .../main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java  | 2 +-
 .../java/org/apache/rocketmq/store/queue/ConsumeQueueInterface.java   | 2 +-
 .../main/java/org/apache/rocketmq/store/queue/ConsumeQueueStore.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java 
b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
index e60f09bce2..ba9b22ae8b 100644
--- a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
+++ b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
@@ -41,7 +41,7 @@ import org.apache.rocketmq.store.SelectMappedBufferResult;
 import org.apache.rocketmq.store.config.BrokerRole;
 import org.apache.rocketmq.store.logfile.MappedFile;
 
-public class BatchConsumeQueue implements ConsumeQueueInterface, 
FileQueueLifeCycle {
+public class BatchConsumeQueue implements ConsumeQueueInterface {
     protected static final Logger log = 
LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME);
 
     /**
diff --git 
a/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueInterface.java
 
b/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueInterface.java
index 76242a5e3b..7931dc45a9 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueInterface.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueInterface.java
@@ -22,7 +22,7 @@ import 
org.apache.rocketmq.common.message.MessageExtBrokerInner;
 import org.apache.rocketmq.store.DispatchRequest;
 import org.apache.rocketmq.store.MessageFilter;
 
-public interface ConsumeQueueInterface {
+public interface ConsumeQueueInterface extends FileQueueLifeCycle {
     /**
      * Get the topic name
      * @return the topic this cq belongs to.
diff --git 
a/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueStore.java 
b/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueStore.java
index 90f2e74aad..082e7bbb38 100644
--- a/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/queue/ConsumeQueueStore.java
@@ -79,7 +79,7 @@ public class ConsumeQueueStore {
     }
 
     private FileQueueLifeCycle getLifeCycle(String topic, int queueId) {
-        return (FileQueueLifeCycle) findOrCreateConsumeQueue(topic, queueId);
+        return findOrCreateConsumeQueue(topic, queueId);
     }
 
     public long rollNextFile(ConsumeQueueInterface consumeQueue, final long 
offset) {
@@ -220,7 +220,7 @@ public class ConsumeQueueStore {
                     FutureTask<Boolean> futureTask = new FutureTask<>(() -> {
                         boolean ret = true;
                         try {
-                            ((FileQueueLifeCycle) logic).recover();
+                            logic.recover();
                         } catch (Throwable e) {
                             ret = false;
                             log.error("Exception occurs while recover consume 
queue concurrently, " +