[rocketmq] branch develop updated: [ISSUE ##3832] in order to improve the performance by change the variable location of queueId (#3833)

[duhengforever]

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

duhengforever 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 4992f4e  [ISSUE ##3832] in order to improve the performance by change 
the variable location of queueId (#3833)
4992f4e is described below

commit 4992f4ee9c09222ed1aaf76f3f4b54f4fedc6ffd
Author: Aaron-TangCode <36765247+aaron-tangc...@users.noreply.github.com>
AuthorDate: Thu Feb 10 11:43:43 2022 +0800

    [ISSUE ##3832] in order to improve the performance by change the variable 
location of queueId (#3833)
    
    * change variable queueId location
    
    * [fix]the wildcard
    
    Co-authored-by: tanghailin <tanghai...@58.com>
---
 .../java/org/apache/rocketmq/store/CommitLog.java  | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java 
b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index c10ffc3..1af5c58 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -16,22 +16,6 @@
  */
 package org.apache.rocketmq.store;
 
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-
 import org.apache.rocketmq.common.ServiceThread;
 import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.constant.LoggerName;
@@ -50,6 +34,22 @@ import org.apache.rocketmq.store.config.MessageStoreConfig;
 import org.apache.rocketmq.store.ha.HAService;
 import org.apache.rocketmq.store.schedule.ScheduleMessageService;
 
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+
 /**
  * Store all metadata downtime for recovery, data protection reliability
  */
@@ -608,8 +608,7 @@ public class CommitLog {
         StoreStatsService storeStatsService = 
this.defaultMessageStore.getStoreStatsService();
 
         String topic = msg.getTopic();
-        int queueId = msg.getQueueId();
-
+//        int queueId msg.getQueueId();
         final int tranType = 
MessageSysFlag.getTransactionValue(msg.getSysFlag());
         if (tranType == MessageSysFlag.TRANSACTION_NOT_TYPE
                 || tranType == MessageSysFlag.TRANSACTION_COMMIT_TYPE) {
@@ -620,7 +619,7 @@ public class CommitLog {
                 }
 
                 topic = TopicValidator.RMQ_SYS_SCHEDULE_TOPIC;
-                queueId = 
ScheduleMessageService.delayLevel2QueueId(msg.getDelayTimeLevel());
+                int queueId = 
ScheduleMessageService.delayLevel2QueueId(msg.getDelayTimeLevel());
 
                 // Backup real topic, queueId
                 MessageAccessor.putProperty(msg, 
MessageConst.PROPERTY_REAL_TOPIC, msg.getTopic());